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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.353 by sf-exg, Sat Feb 12 00:30:00 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 <pcg@goof.com>
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	231	#endif
232		232
233	if (display)	233	if (display)
234	{	234	{
235	selection_clear ();	235	selection_clear ();
		236	selection_clear (true);
236		237
237	#ifdef USE_XIM	238	#ifdef USE_XIM
238	im_destroy ();	239	im_destroy ();
239	#endif	240	#endif
240	scrollBar.destroy ();	241	scrollBar.destroy ();
…		…
265	/* clear all resources */	266	/* clear all resources */
266	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
267	free (allocated [i]);	268	free (allocated [i]);
268		269
269	free (selection.text);	270	free (selection.text);
		271	free (selection.clip_text);
270	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
271	free (env_display);	273	free (env_display);
272	free (env_term);	274	free (env_term);
273	free (locale);	275	free (locale);
274	free (v_buffer);	276	free (v_buffer);
275	free (incr_buf);	277
		278	delete selection_req;
276		279
277	delete envv;	280	delete envv;
278	delete argv;	281	delete argv;
279		282
280	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
316	#endif	319	#endif
317	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
320	#endif	323	#endif
321	incr_ev.stop ();
322	termwin_ev.stop (display);	324	termwin_ev.stop (display);
323	vt_ev.stop (display);	325	vt_ev.stop (display);
324	}	326	}
325		327
326	flush_ev.stop ();	328	flush_ev.stop ();
…		…
348	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
349	{	351	{
350	make_current ();	352	make_current ();
351		353
352	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);
353	}	367	}
354		368
355	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
356	/*	370	/*
357	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
371	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
372	{	386	{
373	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
374	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
375	char number[32];	389	char number[32];
376	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
377	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379	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");
380	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
381	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
384	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
386	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
387	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388	mesg, BUFSIZ);	402	mesg, BUFSIZ);
389	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390	}	404	}
391	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
392	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
393	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
394	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
395	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
396	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
397	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
398	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
399	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
400	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
401	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
402	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403	mesg, BUFSIZ);	417	mesg, BUFSIZ);
404	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
405	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406	mesg, BUFSIZ);	420	mesg, BUFSIZ);
407	else	421	else
408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409	mesg, BUFSIZ);	423	mesg, BUFSIZ);
410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411	}	425	}
412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413	mesg, BUFSIZ);	427	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415	}	429	}
416	#endif	430	#endif
417		431
418	int	432	int
…		…
465	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
466	w.stop ();	480	w.stop ();
467	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
468	}	482	}
469		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
470	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
471		552
472	void	553	void
473	rxvt_init ()	554	rxvt_init ()
474	{	555	{
475	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))));
476		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
477	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479		567
480	rxvt_environ = environ;	568	rxvt_environ = environ;
481		569
482	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
483	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
484		572
485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
489	/* signal (SIGURG, SIG_DFL); */
490		575
491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
493	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
494		579
…		…
619	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	704	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
620		705
621	if (recalc_y)	706	if (recalc_y)
622	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
623		708
624	ncol = width / fwidth;	709	ncol = width / fwidth;
625	nrow = height / fheight;	710	nrow = height / fheight;
626	}	711	}
627		712
628	/----------------------------------------------------------------------/	713	/----------------------------------------------------------------------/
629	/*	714	/*
…		…
640		725
641	ws.ws_col = ncol;	726	ws.ws_col = ncol;
642	ws.ws_row = nrow;	727	ws.ws_row = nrow;
643	ws.ws_xpixel = width;	728	ws.ws_xpixel = width;
644	ws.ws_ypixel = height;	729	ws.ws_ypixel = height;
645	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	730	ioctl (pty->pty, TIOCSWINSZ, &ws);
646		731
647	#if 0	732	#if 0
648	// TIOCSWINSZ is supposed to do this automatically and correctly	733	// TIOCSWINSZ is supposed to do this automatically and correctly
649	if (cmd_pid) /* force through to the command */	734	if (cmd_pid) /* force through to the command */
650	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
…		…
680	#endif	765	#endif
681		766
682	delete fontset[0];	767	delete fontset[0];
683	fontset[0] = fs;	768	fontset[0] = fs;
684		769
685	prop = (*fs)[1]->properties ();	770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
686	prop.height += lineSpace;	771	prop.height += lineSpace;
		772	prop.width += letterSpace;
687		773
688	fs->set_prop (prop, false);	774	fs->set_prop (prop, false);
689		775
690	fwidth = prop.width;	776	fwidth = prop.width;
691	fheight = prop.height;	777	fheight = prop.height;
…		…
741	prop, XA_STRING, 8, PropModeReplace,	827	prop, XA_STRING, 8, PropModeReplace,
742	(const unsigned char *)str, len >= 0 ? len : strlen (str));	828	(const unsigned char *)str, len >= 0 ? len : strlen (str));
743	}	829	}
744		830
745	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
746	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)
747	{	845	{
748	wchar_t *ws = rxvt_mbstowcs (str, len);	846	wchar_t *ws = rxvt_mbstowcs (str, len);
749	char *s = rxvt_wcstoutf8 (ws);	847	char *s = rxvt_wcstoutf8 (ws);
750		848
…		…
760	/----------------------------------------------------------------------/	858	/----------------------------------------------------------------------/
761	/* xterm sequences - title, iconName, color (exptl) */	859	/* xterm sequences - title, iconName, color (exptl) */
762	void	860	void
763	rxvt_term::set_title (const char *str)	861	rxvt_term::set_title (const char *str)
764	{	862	{
765	set_string_property (XA_WM_NAME, str);	863	set_mbstring_property (XA_WM_NAME, str);
766	#if ENABLE_EWMH	864	#if ENABLE_EWMH
767	set_utf8_property (xa[XA_NET_WM_NAME], str);	865	set_utf8_property (xa[XA_NET_WM_NAME], str);
768	#endif	866	#endif
769	}	867	}
770		868
771	void	869	void
772	rxvt_term::set_icon_name (const char *str)	870	rxvt_term::set_icon_name (const char *str)
773	{	871	{
774	set_string_property (XA_WM_ICON_NAME, str);	872	set_mbstring_property (XA_WM_ICON_NAME, str);
775	#if ENABLE_EWMH	873	#if ENABLE_EWMH
776	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	874	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
777	#endif	875	#endif
778	}	876	}
779		877
…		…
851	void	949	void
852	rxvt_term::set_colorfgbg ()	950	rxvt_term::set_colorfgbg ()
853	{	951	{
854	unsigned int i;	952	unsigned int i;
855	const char *xpmb = "";	953	const char *xpmb = "";
856	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	954	char fstr[] = "default";
		955	char bstr[] = "default";
857		956
858	strcpy (fstr, "default");
859	strcpy (bstr, "default");
860	for (i = Color_Black; i <= Color_White; i++)	957	for (i = Color_Black; i <= Color_White; i++)
861	if (pix_colors[Color_fg] == pix_colors[i])	958	if (pix_colors[Color_fg] == pix_colors[i])
862	{	959	{
863	sprintf (fstr, "%d", (i - Color_Black));	960	sprintf (fstr, "%d", i - Color_Black);
864	break;	961	break;
865	}	962	}
866		963
867	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
868	if (pix_colors[Color_bg] == pix_colors[i])	965	if (pix_colors[Color_bg] == pix_colors[i])
869	{	966	{
870	sprintf (bstr, "%d", (i - Color_Black));	967	sprintf (bstr, "%d", i - Color_Black);
871	#ifdef BG_IMAGE_FROM_FILE	968	#ifdef BG_IMAGE_FROM_FILE
872	xpmb = "default;";	969	xpmb = "default;";
873	#endif	970	#endif
874	break;	971	break;
875	}	972	}
…		…
905	int old_width = szHint.width;	1002	int old_width = szHint.width;
906	int old_height = szHint.height;	1003	int old_height = szHint.height;
907		1004
908	window_calc (newwidth, newheight);	1005	window_calc (newwidth, newheight);
909		1006
910	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1007	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1008
		1009	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1010	if (set_hint)
		1011	{
		1012	szHint.flags &= ~(PBaseSize \| PResizeInc);
911	XSetWMNormalHints (dpy, parent[0], &szHint);	1013	XSetWMNormalHints (dpy, parent[0], &szHint);
		1014	szHint.flags \|= PBaseSize \| PResizeInc;
		1015	}
912		1016
913	if (!ignoreparent)	1017	if (!ignoreparent)
914	{	1018	{
915	#ifdef SMART_RESIZE	1019	#ifdef SMART_RESIZE
916	/*	1020	/*
…		…
956	#else	1060	#else
957	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1061	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
958	#endif	1062	#endif
959	}	1063	}
960		1064
		1065	if (set_hint)
		1066	XSetWMNormalHints (dpy, parent[0], &szHint);
		1067
961	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1068	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
962		1069
963	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1070	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
964	{	1071	{
965	if (scrollBar.state)	1072	if (scrollBar.state)
…		…
968	XMoveResizeWindow (dpy, vt,	1075	XMoveResizeWindow (dpy, vt,
969	window_vt_x, window_vt_y,	1076	window_vt_x, window_vt_y,
970	width, height);	1077	width, height);
971		1078
972	#ifdef HAVE_BG_PIXMAP	1079	#ifdef HAVE_BG_PIXMAP
973	if (bgPixmap.window_size_sensitive ())	1080	if (bg_window_size_sensitive ())
974	update_background ();	1081	update_background ();
975	#endif	1082	#endif
976
977	scr_clear ();
978	}	1083	}
979		1084
980	if (fix_screen \|\| old_height == 0)	1085	if (fix_screen \|\| old_height == 0)
981	scr_reset ();	1086	scr_reset ();
982
983	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
984	//scr_touch (false);
985
986	#ifdef HAVE_BG_PIXMAP
987	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
988	// if (bgPixmap.pixmap)
989	// scr_touch (false);
990	#endif
991		1087
992	#ifdef USE_XIM	1088	#ifdef USE_XIM
993	IMSetPosition ();	1089	IMSetPosition ();
994	#endif	1090	#endif
995	}	1091	}
…		…
1061		1157
1062	/* Checking whether input method is running. */	1158	/* Checking whether input method is running. */
1063	bool	1159	bool
1064	rxvt_term::IMisRunning ()	1160	rxvt_term::IMisRunning ()
1065	{	1161	{
1066	char *p;
1067	Atom atom;	1162	Atom atom;
1068	Window win;	1163	Window win;
1069	char server[IMBUFSIZ];	1164	char server[IMBUFSIZ];
1070		1165
1071	/* get current locale modifier */	1166	/* get current locale modifier */
1072	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1167	if (char *p = XSetLocaleModifiers (0))
1073	{	1168	{
1074	strcpy (server, "@server=");	1169	strcpy (server, "@server=");
1075	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1170	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1076		1171
1077	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1172	if (p = strchr (server + 1, '@')) /* first one only */
1078	*p = '\0';	1173	*p = '\0';
1079		1174
1080	atom = XInternAtom (dpy, server, False);	1175	atom = XInternAtom (dpy, server, False);
1081	win = XGetSelectionOwner (dpy, atom);	1176	win = XGetSelectionOwner (dpy, atom);
1082		1177
1083	if (win != None)	1178	if (win != None)
1084	return True;	1179	return true;
1085	}	1180	}
1086		1181
1087	return False;	1182	return false;
1088	}	1183	}
1089		1184
1090	void	1185	void
1091	rxvt_term::IMSendSpot ()	1186	rxvt_term::IMSendSpot ()
1092	{	1187	{
…		…
1149		1244
1150	term->make_current ();	1245	term->make_current ();
1151		1246
1152	if (text)	1247	if (text)
1153	{	1248	{
1154	void *str;	1249	wchar_t *str;
1155		1250
1156	if (!text->encoding_is_wchar && text->string.multi_byte)	1251	if (!text->encoding_is_wchar && text->string.multi_byte)
1157	{	1252	{
1158	// of course, X makes it ugly again	1253	// of course, X makes it ugly again
1159	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1160	SET_LOCALE (term->rs[Rs_imLocale]);	1255	SET_LOCALE (term->rs[Rs_imLocale]);
1161		1256
1162	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1257	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1163	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1258	mbstowcs (str, text->string.multi_byte, text->length + 1);
1164		1259
1165	if (term->rs[Rs_imLocale])	1260	if (term->rs[Rs_imLocale])
1166	SET_LOCALE (term->locale);	1261	SET_LOCALE (term->locale);
1167	}	1262	}
1168	else	1263	else
1169	str = (void *)text->string.wide_char;	1264	str = text->string.wide_char;
1170		1265
1171	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1266	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1172	DT_INT, call_data->caret,	1267	DT_INT, call_data->caret,
1173	DT_INT, call_data->chg_first,	1268	DT_INT, call_data->chg_first,
1174	DT_INT, call_data->chg_length,	1269	DT_INT, call_data->chg_length,
…		…
1245	p = pet[pi];	1340	p = pet[pi];
1246		1341
1247	if (!p)	1342	if (!p)
1248	continue;	1343	continue;
1249		1344
1250	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1251		1346
1252	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1253	{	1348	{
1254	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1255	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1267	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1268		1363
1269	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1270	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1271	{	1366	{
1272	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1273		1368
1274	found = 1;	1369	found = 1;
1275	goto foundpet;	1370	goto foundpet;
1276	}	1371	}
1277		1372
1278	}	1373	}
1279		1374
1280	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1281	}	1376	}
1282		1377
1283	foundpet:	1378	foundpet:
1284		1379
1285	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1441	p = rs[Rs_inputMethod];	1536	p = rs[Rs_inputMethod];
1442	if (p && *p)	1537	if (p && *p)
1443	{	1538	{
1444	bool found = false;	1539	bool found = false;
1445		1540
1446	s = rxvt_splitcommastring (p);	1541	s = rxvt_strsplit (',', p);
1447		1542
1448	for (i = 0; s[i]; i++)	1543	for (i = 0; s[i]; i++)
1449	{	1544	{
1450	if (*s[i])	1545	if (*s[i])
1451	{	1546	{
…		…
1457	break;	1552	break;
1458	}	1553	}
1459	}	1554	}
1460	}	1555	}
1461		1556
1462	rxvt_freecommastring (s);	1557	rxvt_free_strsplit (s);
1463		1558
1464	if (found)	1559	if (found)
1465	goto done;	1560	goto done;
1466	}	1561	}
1467		1562
…		…
1528	void	1623	void
1529	rxvt_term::get_window_origin (int &x, int &y)	1624	rxvt_term::get_window_origin (int &x, int &y)
1530	{	1625	{
1531	Window cr;	1626	Window cr;
1532	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1627	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1533	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1534	}	1628	}
1535		1629
1536	Pixmap	1630	Pixmap
1537	rxvt_term::get_pixmap_property (int prop_id)	1631	rxvt_term::get_pixmap_property (Atom property)
1538	{	1632	{
1539	if (prop_id > 0 && prop_id < NUM_XA)	1633	Pixmap pixmap = None;
1540	if (xa[prop_id])	1634
1541	{
1542	int aformat;	1635	int aformat;
1543	unsigned long nitems, bytes_after;	1636	unsigned long nitems, bytes_after;
1544	Atom atype;	1637	Atom atype;
1545	unsigned char *prop = NULL;	1638	unsigned char *prop;
1546	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1639	int result = XGetWindowProperty (dpy, display->root, property,
1547	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1640	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1548	&nitems, &bytes_after, &prop);	1641	&nitems, &bytes_after, &prop);
1549	if (result == Success && prop && atype == XA_PIXMAP)	1642	if (result == Success)
		1643	{
		1644	if (atype == XA_PIXMAP)
1550	return (Pixmap )prop;	1645	pixmap = (Pixmap )prop;
		1646	XFree (prop);
1551	}	1647	}
1552		1648
1553	return None;	1649	return pixmap;
1554	}	1650	}
1555		1651
1556	#ifdef HAVE_BG_PIXMAP	1652	#ifdef HAVE_BG_PIXMAP
1557	# if TRACE_PIXMAPS
1558	# undef update_background
1559	void
1560	rxvt_term::trace_update_background (const char *file, int line)
1561	{
1562	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1563	update_background ();
1564	}
1565	# endif
1566		1653
1567	void	1654	void
1568	rxvt_term::update_background ()	1655	rxvt_term::update_background ()
1569	{	1656	{
1570	if (update_background_ev.is_active ())	1657	if (update_background_ev.is_active ())
1571	return;	1658	return;
1572		1659
1573	bgPixmap.invalidate ();	1660	bg_invalidate ();
1574		1661
1575	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1662	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1576		1663
1577	if (to_wait <= 0.)	1664	if (to_wait <= 0.)
1578	bgPixmap.render ();	1665	bg_render ();
1579	else	1666	else
1580	update_background_ev.start (to_wait);	1667	update_background_ev.start (to_wait);
1581	}	1668	}
1582		1669
1583	void	1670	void
1584	rxvt_term::update_background_cb (ev::timer &w, int revents)	1671	rxvt_term::update_background_cb (ev::timer &w, int revents)
1585	{	1672	{
1586	make_current ();	1673	make_current ();
1587		1674
1588	update_background_ev.stop ();	1675	update_background_ev.stop ();
1589	bgPixmap.render ();	1676	bg_render ();
1590	refresh_check ();	1677	refresh_check ();
1591	}	1678	}
1592		1679
1593	#endif /* HAVE_BG_PIXMAP */	1680	#endif /* HAVE_BG_PIXMAP */
1594		1681

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs. Revision 1.353 by sf-exg, Sat Feb 12 00:30:00 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.353 by sf-exg, Sat Feb 12 00:30:00 2011 UTC