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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.316 by root, Sun Apr 26 01:51:20 2009 UTC vs.
Revision 1.354 by root, Mon Feb 21 07:41:02 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 ();
		236	selection_clear (true);
242		237
243	#ifdef USE_XIM	238	#ifdef USE_XIM
244	im_destroy ();	239	im_destroy ();
245	#endif	240	#endif
246	scrollBar.destroy ();	241	scrollBar.destroy ();
…		…
271	/* clear all resources */	266	/* clear all resources */
272	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
273	free (allocated [i]);	268	free (allocated [i]);
274		269
275	free (selection.text);	270	free (selection.text);
		271	free (selection.clip_text);
276	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
277	free (env_display);	273	free (env_display);
278	free (env_term);	274	free (env_term);
279	free (locale);	275	free (locale);
280	free (v_buffer);	276	free (v_buffer);
281	free (incr_buf);	277
		278	delete selection_req;
282		279
283	delete envv;	280	delete envv;
284	delete argv;	281	delete argv;
285		282
286	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
322	#endif	319	#endif
323	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
324	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
325	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
326	#endif	323	#endif
327	incr_ev.stop ();
328	termwin_ev.stop (display);	324	termwin_ev.stop (display);
329	vt_ev.stop (display);	325	vt_ev.stop (display);
330	}	326	}
331		327
332	flush_ev.stop ();	328	flush_ev.stop ();
…		…
354	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
355	{	351	{
356	make_current ();	352	make_current ();
357		353
358	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);
359	}	367	}
360		368
361	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
362	/*	370	/*
363	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
377	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
378	{	386	{
379	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
380	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
381	char number[32];	389	char number[32];
382	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
383	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385	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");
386	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
387	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
390	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
392	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
393	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394	mesg, BUFSIZ);	402	mesg, BUFSIZ);
395	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396	}	404	}
397	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
398	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
399	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
400	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
401	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
402	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
403	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
404	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
405	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
406	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
407	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
408	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409	mesg, BUFSIZ);	417	mesg, BUFSIZ);
410	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
411	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412	mesg, BUFSIZ);	420	mesg, BUFSIZ);
413	else	421	else
414	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415	mesg, BUFSIZ);	423	mesg, BUFSIZ);
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417	}	425	}
418	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419	mesg, BUFSIZ);	427	mesg, BUFSIZ);
420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421	}	429	}
422	#endif	430	#endif
423		431
424	int	432	int
…		…
471	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
472	w.stop ();	480	w.stop ();
473	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
474	}	482	}
475		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
476	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
477		552
478	void	553	void
479	rxvt_init ()	554	rxvt_init ()
480	{	555	{
481	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))));
482		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
483	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
484	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485		567
486	rxvt_environ = environ;	568	rxvt_environ = environ;
487		569
488	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
489	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
490		572
491	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
495	/* signal (SIGURG, SIG_DFL); */
496		575
497	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
499	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
500		579
…		…
646		725
647	ws.ws_col = ncol;	726	ws.ws_col = ncol;
648	ws.ws_row = nrow;	727	ws.ws_row = nrow;
649	ws.ws_xpixel = width;	728	ws.ws_xpixel = width;
650	ws.ws_ypixel = height;	729	ws.ws_ypixel = height;
651	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	730	ioctl (pty->pty, TIOCSWINSZ, &ws);
652		731
653	#if 0	732	#if 0
654	// TIOCSWINSZ is supposed to do this automatically and correctly	733	// TIOCSWINSZ is supposed to do this automatically and correctly
655	if (cmd_pid) /* force through to the command */	734	if (cmd_pid) /* force through to the command */
656	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
…		…
686	#endif	765	#endif
687		766
688	delete fontset[0];	767	delete fontset[0];
689	fontset[0] = fs;	768	fontset[0] = fs;
690		769
691	prop = (*fs)[1]->properties ();	770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692	prop.height += lineSpace;	771	prop.height += lineSpace;
		772	prop.width += letterSpace;
693		773
694	fs->set_prop (prop, false);	774	fs->set_prop (prop, false);
695		775
696	fwidth = prop.width;	776	fwidth = prop.width;
697	fheight = prop.height;	777	fheight = prop.height;
…		…
747	prop, XA_STRING, 8, PropModeReplace,	827	prop, XA_STRING, 8, PropModeReplace,
748	(const unsigned char *)str, len >= 0 ? len : strlen (str));	828	(const unsigned char *)str, len >= 0 ? len : strlen (str));
749	}	829	}
750		830
751	void	831	void
		832	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		833	{
		834	XTextProperty ct;
		835
		836	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		837	{
		838	XSetTextProperty (dpy, parent[0], &ct, prop);
		839	XFree (ct.value);
		840	}
		841	}
		842
		843	void
752	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	844	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753	{	845	{
754	wchar_t *ws = rxvt_mbstowcs (str, len);	846	wchar_t *ws = rxvt_mbstowcs (str, len);
755	char *s = rxvt_wcstoutf8 (ws);	847	char *s = rxvt_wcstoutf8 (ws);
756		848
…		…
766	/----------------------------------------------------------------------/	858	/----------------------------------------------------------------------/
767	/* xterm sequences - title, iconName, color (exptl) */	859	/* xterm sequences - title, iconName, color (exptl) */
768	void	860	void
769	rxvt_term::set_title (const char *str)	861	rxvt_term::set_title (const char *str)
770	{	862	{
771	set_string_property (XA_WM_NAME, str);	863	set_mbstring_property (XA_WM_NAME, str);
772	#if ENABLE_EWMH	864	#if ENABLE_EWMH
773	set_utf8_property (xa[XA_NET_WM_NAME], str);	865	set_utf8_property (xa[XA_NET_WM_NAME], str);
774	#endif	866	#endif
775	}	867	}
776		868
777	void	869	void
778	rxvt_term::set_icon_name (const char *str)	870	rxvt_term::set_icon_name (const char *str)
779	{	871	{
780	set_string_property (XA_WM_ICON_NAME, str);	872	set_mbstring_property (XA_WM_ICON_NAME, str);
781	#if ENABLE_EWMH	873	#if ENABLE_EWMH
782	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	874	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783	#endif	875	#endif
784	}	876	}
785		877
…		…
857	void	949	void
858	rxvt_term::set_colorfgbg ()	950	rxvt_term::set_colorfgbg ()
859	{	951	{
860	unsigned int i;	952	unsigned int i;
861	const char *xpmb = "";	953	const char *xpmb = "";
862	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	954	char fstr[] = "default";
		955	char bstr[] = "default";
863		956
864	strcpy (fstr, "default");
865	strcpy (bstr, "default");
866	for (i = Color_Black; i <= Color_White; i++)	957	for (i = Color_Black; i <= Color_White; i++)
867	if (pix_colors[Color_fg] == pix_colors[i])	958	if (pix_colors[Color_fg] == pix_colors[i])
868	{	959	{
869	sprintf (fstr, "%d", (i - Color_Black));	960	sprintf (fstr, "%d", i - Color_Black);
870	break;	961	break;
871	}	962	}
872		963
873	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
874	if (pix_colors[Color_bg] == pix_colors[i])	965	if (pix_colors[Color_bg] == pix_colors[i])
875	{	966	{
876	sprintf (bstr, "%d", (i - Color_Black));	967	sprintf (bstr, "%d", i - Color_Black);
877	#ifdef BG_IMAGE_FROM_FILE	968	#ifdef BG_IMAGE_FROM_FILE
878	xpmb = "default;";	969	xpmb = "default;";
879	#endif	970	#endif
880	break;	971	break;
881	}	972	}
…		…
984	XMoveResizeWindow (dpy, vt,	1075	XMoveResizeWindow (dpy, vt,
985	window_vt_x, window_vt_y,	1076	window_vt_x, window_vt_y,
986	width, height);	1077	width, height);
987		1078
988	#ifdef HAVE_BG_PIXMAP	1079	#ifdef HAVE_BG_PIXMAP
989	if (bgPixmap.window_size_sensitive ())	1080	if (bg_window_size_sensitive ())
990	update_background ();	1081	update_background ();
991	#endif	1082	#endif
992	}	1083	}
993		1084
994	if (fix_screen \|\| old_height == 0)	1085	if (fix_screen \|\| old_height == 0)
995	scr_reset ();	1086	scr_reset ();
996
997	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
998	//scr_touch (false);
999
1000	#ifdef HAVE_BG_PIXMAP
1001	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002	// if (bgPixmap.pixmap)
1003	// scr_touch (false);
1004	#endif
1005		1087
1006	#ifdef USE_XIM	1088	#ifdef USE_XIM
1007	IMSetPosition ();	1089	IMSetPosition ();
1008	#endif	1090	#endif
1009	}	1091	}
…		…
1092		1174
1093	atom = XInternAtom (dpy, server, False);	1175	atom = XInternAtom (dpy, server, False);
1094	win = XGetSelectionOwner (dpy, atom);	1176	win = XGetSelectionOwner (dpy, atom);
1095		1177
1096	if (win != None)	1178	if (win != None)
1097	return True;	1179	return true;
1098	}	1180	}
1099		1181
1100	return False;	1182	return false;
1101	}	1183	}
1102		1184
1103	void	1185	void
1104	rxvt_term::IMSendSpot ()	1186	rxvt_term::IMSendSpot ()
1105	{	1187	{
…		…
1162		1244
1163	term->make_current ();	1245	term->make_current ();
1164		1246
1165	if (text)	1247	if (text)
1166	{	1248	{
1167	void *str;	1249	wchar_t *str;
1168		1250
1169	if (!text->encoding_is_wchar && text->string.multi_byte)	1251	if (!text->encoding_is_wchar && text->string.multi_byte)
1170	{	1252	{
1171	// of course, X makes it ugly again	1253	// of course, X makes it ugly again
1172	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1173	SET_LOCALE (term->rs[Rs_imLocale]);	1255	SET_LOCALE (term->rs[Rs_imLocale]);
1174		1256
1175	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1257	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1176	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1258	mbstowcs (str, text->string.multi_byte, text->length + 1);
1177		1259
1178	if (term->rs[Rs_imLocale])	1260	if (term->rs[Rs_imLocale])
1179	SET_LOCALE (term->locale);	1261	SET_LOCALE (term->locale);
1180	}	1262	}
1181	else	1263	else
1182	str = (void *)text->string.wide_char;	1264	str = text->string.wide_char;
1183		1265
1184	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1266	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1185	DT_INT, call_data->caret,	1267	DT_INT, call_data->caret,
1186	DT_INT, call_data->chg_first,	1268	DT_INT, call_data->chg_first,
1187	DT_INT, call_data->chg_length,	1269	DT_INT, call_data->chg_length,
…		…
1258	p = pet[pi];	1340	p = pet[pi];
1259		1341
1260	if (!p)	1342	if (!p)
1261	continue;	1343	continue;
1262		1344
1263	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1264		1346
1265	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1266	{	1348	{
1267	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1268	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1280	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1281		1363
1282	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1283	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1284	{	1366	{
1285	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1286		1368
1287	found = 1;	1369	found = 1;
1288	goto foundpet;	1370	goto foundpet;
1289	}	1371	}
1290		1372
1291	}	1373	}
1292		1374
1293	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1294	}	1376	}
1295		1377
1296	foundpet:	1378	foundpet:
1297		1379
1298	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1454	p = rs[Rs_inputMethod];	1536	p = rs[Rs_inputMethod];
1455	if (p && *p)	1537	if (p && *p)
1456	{	1538	{
1457	bool found = false;	1539	bool found = false;
1458		1540
1459	s = rxvt_splitcommastring (p);	1541	s = rxvt_strsplit (',', p);
1460		1542
1461	for (i = 0; s[i]; i++)	1543	for (i = 0; s[i]; i++)
1462	{	1544	{
1463	if (*s[i])	1545	if (*s[i])
1464	{	1546	{
…		…
1470	break;	1552	break;
1471	}	1553	}
1472	}	1554	}
1473	}	1555	}
1474		1556
1475	rxvt_freecommastring (s);	1557	rxvt_free_strsplit (s);
1476		1558
1477	if (found)	1559	if (found)
1478	goto done;	1560	goto done;
1479	}	1561	}
1480		1562
…		…
1541	void	1623	void
1542	rxvt_term::get_window_origin (int &x, int &y)	1624	rxvt_term::get_window_origin (int &x, int &y)
1543	{	1625	{
1544	Window cr;	1626	Window cr;
1545	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1627	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547	}	1628	}
1548		1629
1549	Pixmap	1630	Pixmap
1550	rxvt_term::get_pixmap_property (int prop_id)	1631	rxvt_term::get_pixmap_property (Atom property)
1551	{	1632	{
1552	if (prop_id > 0 && prop_id < NUM_XA)	1633	Pixmap pixmap = None;
1553	if (xa[prop_id])	1634
1554	{
1555	int aformat;	1635	int aformat;
1556	unsigned long nitems, bytes_after;	1636	unsigned long nitems, bytes_after;
1557	Atom atype;	1637	Atom atype;
1558	unsigned char *prop = NULL;	1638	unsigned char *prop;
1559	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1639	int result = XGetWindowProperty (dpy, display->root, property,
1560	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1640	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561	&nitems, &bytes_after, &prop);	1641	&nitems, &bytes_after, &prop);
1562	if (result == Success && prop && atype == XA_PIXMAP)	1642	if (result == Success)
		1643	{
		1644	if (atype == XA_PIXMAP)
1563	return (Pixmap )prop;	1645	pixmap = (Pixmap )prop;
		1646	XFree (prop);
1564	}	1647	}
1565		1648
1566	return None;	1649	return pixmap;
1567	}	1650	}
1568		1651
1569	#ifdef HAVE_BG_PIXMAP	1652	#ifdef HAVE_BG_PIXMAP
1570	# if TRACE_PIXMAPS
1571	# undef update_background
1572	void
1573	rxvt_term::trace_update_background (const char *file, int line)
1574	{
1575	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576	update_background ();
1577	}
1578	# endif
1579		1653
1580	void	1654	void
1581	rxvt_term::update_background ()	1655	rxvt_term::update_background ()
1582	{	1656	{
1583	if (update_background_ev.is_active ())	1657	if (update_background_ev.is_active ())
1584	return;	1658	return;
1585		1659
1586	bgPixmap.invalidate ();	1660	bg_invalidate ();
1587		1661
1588	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1662	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1589		1663
1590	if (to_wait <= 0.)	1664	if (to_wait <= 0.)
1591	bgPixmap.render ();	1665	bg_render ();
1592	else	1666	else
1593	update_background_ev.start (to_wait);	1667	update_background_ev.start (to_wait);
1594	}	1668	}
1595		1669
1596	void	1670	void
1597	rxvt_term::update_background_cb (ev::timer &w, int revents)	1671	rxvt_term::update_background_cb (ev::timer &w, int revents)
1598	{	1672	{
1599	make_current ();	1673	make_current ();
1600		1674
1601	update_background_ev.stop ();	1675	update_background_ev.stop ();
1602	bgPixmap.render ();	1676	bg_render ();
1603	refresh_check ();	1677	refresh_check ();
1604	}	1678	}
1605		1679
1606	#endif /* HAVE_BG_PIXMAP */	1680	#endif /* HAVE_BG_PIXMAP */
1607		1681

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.316 by root, Sun Apr 26 01:51:20 2009 UTC vs. Revision 1.354 by root, Mon Feb 21 07:41:02 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.316 by root, Sun Apr 26 01:51:20 2009 UTC vs.
Revision 1.354 by root, Mon Feb 21 07:41:02 2011 UTC