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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.315 by root, Wed Nov 5 12:29:26 2008 UTC vs.
Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 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));
…		…
225	delete fontset[i];	226	delete fontset[i];
226	#endif	227	#endif
227	delete fontset[0];	228	delete fontset[0];
228		229
229	#ifdef HAVE_BG_PIXMAP	230	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	231	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	232	#endif
238		233
239	if (display)	234	if (display)
240	{	235	{
241	selection_clear ();	236	selection_clear ();
		237	selection_clear (true);
242		238
243	#ifdef USE_XIM	239	#ifdef USE_XIM
244	im_destroy ();	240	im_destroy ();
245	#endif	241	#endif
246	scrollBar.destroy ();	242	scrollBar.destroy ();
…		…
271	/* clear all resources */	267	/* clear all resources */
272	for (int i = 0; i < allocated.size (); i++)	268	for (int i = 0; i < allocated.size (); i++)
273	free (allocated [i]);	269	free (allocated [i]);
274		270
275	free (selection.text);	271	free (selection.text);
		272	free (selection.clip_text);
276	// TODO: manage env vars in child only(!)	273	// TODO: manage env vars in child only(!)
277	free (env_display);	274	free (env_display);
278	free (env_term);	275	free (env_term);
279	free (locale);	276	free (locale);
280	free (v_buffer);	277	free (v_buffer);
…		…
356	make_current ();	353	make_current ();
357		354
358	delete this;	355	delete this;
359	}	356	}
360		357
		358	void
		359	rxvt_term::set_option (uint8_t opt, bool set)
		360	{
		361	if (!opt)
		362	return;
		363
		364	uint8_t mask = 1 << (opt & 7);
		365	uint8_t &val = options [opt >> 3];
		366
		367	val = val & ~mask \| (set ? mask : 0);
		368	}
		369
361	/----------------------------------------------------------------------/	370	/----------------------------------------------------------------------/
362	/*	371	/*
363	* Exit gracefully, clearing the utmp entry and restoring tty attributes	372	* Exit gracefully, clearing the utmp entry and restoring tty attributes
364	* TODO: if debugging, this should free up any known resources if we can	373	* TODO: if debugging, this should free up any known resources if we can
365	*/	374	*/
…		…
377	print_x_error (Display dpy, XErrorEvent event)	386	print_x_error (Display dpy, XErrorEvent event)
378	{	387	{
379	char buffer[BUFSIZ];	388	char buffer[BUFSIZ];
380	char mesg[BUFSIZ];	389	char mesg[BUFSIZ];
381	char number[32];	390	char number[32];
382	char *mtype = "XlibMessage";	391	const char mtype[] = "XlibMessage";
383	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	392	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	393	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385	rxvt_warn ("An X Error occured, trying to continue after report.\n");	394	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386	rxvt_warn ("%s: %s\n", mesg, buffer);	395	rxvt_warn ("%s: %s\n", mesg, buffer);
387	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	396	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	397	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389	sprintf(number, "%d", event->request_code);	398	sprintf(number, "%d", event->request_code);
390	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	399	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391	rxvt_warn ("(which is %s)\n", buffer);	400	rxvt_warn ("(which is %s)\n", buffer);
392	if (event->request_code >= 128) {	401	if (event->request_code >= 128) {
393	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	402	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394	mesg, BUFSIZ);	403	mesg, BUFSIZ);
395	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	404	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396	}	405	}
397	if ((event->error_code == BadWindow) \|\|	406	if ((event->error_code == BadWindow) \|\|
398	(event->error_code == BadPixmap) \|\|	407	(event->error_code == BadPixmap) \|\|
399	(event->error_code == BadCursor) \|\|	408	(event->error_code == BadCursor) \|\|
400	(event->error_code == BadFont) \|\|	409	(event->error_code == BadFont) \|\|
401	(event->error_code == BadDrawable) \|\|	410	(event->error_code == BadDrawable) \|\|
402	(event->error_code == BadColor) \|\|	411	(event->error_code == BadColor) \|\|
403	(event->error_code == BadGC) \|\|	412	(event->error_code == BadGC) \|\|
404	(event->error_code == BadIDChoice) \|\|	413	(event->error_code == BadIDChoice) \|\|
405	(event->error_code == BadValue) \|\|	414	(event->error_code == BadValue) \|\|
406	(event->error_code == BadAtom)) {	415	(event->error_code == BadAtom)) {
407	if (event->error_code == BadValue)	416	if (event->error_code == BadValue)
408	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409	mesg, BUFSIZ);	418	mesg, BUFSIZ);
410	else if (event->error_code == BadAtom)	419	else if (event->error_code == BadAtom)
411	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	420	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412	mesg, BUFSIZ);	421	mesg, BUFSIZ);
413	else	422	else
414	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	423	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415	mesg, BUFSIZ);	424	mesg, BUFSIZ);
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417	}	426	}
418	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	427	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419	mesg, BUFSIZ);	428	mesg, BUFSIZ);
420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	429	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421	}	430	}
422	#endif	431	#endif
423		432
424	int	433	int
…		…
471	rxvt_emergency_cleanup ();	480	rxvt_emergency_cleanup ();
472	w.stop ();	481	w.stop ();
473	kill (getpid (), w.signum);	482	kill (getpid (), w.signum);
474	}	483	}
475		484
		485	static void
		486	rxvt_get_ttymode (struct termios *tio)
		487	{
		488	if (tcgetattr (STDIN_FILENO, tio) < 0)
		489	memset (tio, 0, sizeof (struct termios));
		490
		491	for (int i = 0; i < NCCS; i++)
		492	tio->c_cc[i] = VDISABLE;
		493
		494	tio->c_cc[VINTR] = CINTR;
		495	tio->c_cc[VQUIT] = CQUIT;
		496	tio->c_cc[VERASE] = CERASE;
		497	#ifdef VERASE2
		498	tio->c_cc[VERASE2] = CERASE2;
		499	#endif
		500	tio->c_cc[VKILL] = CKILL;
		501	tio->c_cc[VEOF] = CEOF;
		502	tio->c_cc[VSTART] = CSTART;
		503	tio->c_cc[VSTOP] = CSTOP;
		504	tio->c_cc[VSUSP] = CSUSP;
		505	# ifdef VDSUSP
		506	tio->c_cc[VDSUSP] = CDSUSP;
		507	# endif
		508	# ifdef VREPRINT
		509	tio->c_cc[VREPRINT] = CRPRNT;
		510	# endif
		511	# ifdef VDISCRD
		512	tio->c_cc[VDISCRD] = CFLUSH;
		513	# endif
		514	# ifdef VWERSE
		515	tio->c_cc[VWERSE] = CWERASE;
		516	# endif
		517	# ifdef VLNEXT
		518	tio->c_cc[VLNEXT] = CLNEXT;
		519	# endif
		520	# ifdef VSTATUS
		521	tio->c_cc[VSTATUS] = CSTATUS;
		522	# endif
		523
		524	# if VMIN != VEOF
		525	tio->c_cc[VMIN] = 1;
		526	# endif
		527	# if VTIME != VEOL
		528	tio->c_cc[VTIME] = 0;
		529	# endif
		530
		531	/* input modes */
		532	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		533	# ifdef IMAXBEL
		534	\| IMAXBEL
		535	# endif
		536	\| IXON);
		537
		538	/* output modes */
		539	tio->c_oflag = (OPOST \| ONLCR);
		540
		541	/* control modes */
		542	tio->c_cflag = (CS8 \| CREAD);
		543
		544	/* local modes */
		545	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		546	# if defined (ECHOCTL) && defined (ECHOKE)
		547	\| ECHOCTL \| ECHOKE
		548	# endif
		549	\| ECHOE \| ECHOK);
		550	}
		551
476	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
477		553
478	void	554	void
479	rxvt_init ()	555	rxvt_init ()
480	{	556	{
481	ptytty::init ();	557	assert (("fontMask must not overlap other RS masks",
		558	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
482		559
		560	rxvt_get_ttymode (&rxvt_term::def_tio);
		561
		562	// get rid of stdin/stdout as we don't need them, to free resources
		563	dup2 (STDERR_FILENO, STDIN_FILENO);
		564	dup2 (STDERR_FILENO, STDOUT_FILENO);
		565
483	if (!ev_default_loop (0))	566	if (!ev_default_loop ())
484	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	567	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485		568
486	rxvt_environ = environ;	569	rxvt_environ = environ;
487		570
488	signal (SIGHUP, SIG_IGN);	571	signal (SIGHUP, SIG_IGN);
489	signal (SIGPIPE, SIG_IGN);	572	signal (SIGPIPE, SIG_IGN);
490		573
491	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	574	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492	sig_handlers.sw_int.start (SIGINT); ev_unref ();	575	sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
495	/* signal (SIGURG, SIG_DFL); */
496		576
497	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	577	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498	// TODO: handle this with exceptions and tolerate the memory loss	578	// TODO: handle this with exceptions and tolerate the memory loss
499	XSetIOErrorHandler (rxvt_xioerror_handler);	579	XSetIOErrorHandler (rxvt_xioerror_handler);
500		580
…		…
646		726
647	ws.ws_col = ncol;	727	ws.ws_col = ncol;
648	ws.ws_row = nrow;	728	ws.ws_row = nrow;
649	ws.ws_xpixel = width;	729	ws.ws_xpixel = width;
650	ws.ws_ypixel = height;	730	ws.ws_ypixel = height;
651	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	731	ioctl (pty->pty, TIOCSWINSZ, &ws);
652		732
653	#if 0	733	#if 0
654	// TIOCSWINSZ is supposed to do this automatically and correctly	734	// TIOCSWINSZ is supposed to do this automatically and correctly
655	if (cmd_pid) /* force through to the command */	735	if (cmd_pid) /* force through to the command */
656	kill (-cmd_pid, SIGWINCH);	736	kill (-cmd_pid, SIGWINCH);
…		…
686	#endif	766	#endif
687		767
688	delete fontset[0];	768	delete fontset[0];
689	fontset[0] = fs;	769	fontset[0] = fs;
690		770
691	prop = (*fs)[1]->properties ();	771	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692	prop.height += lineSpace;	772	prop.height += lineSpace;
		773	prop.width += letterSpace;
693		774
694	fs->set_prop (prop, false);	775	fs->set_prop (prop, false);
695		776
696	fwidth = prop.width;	777	fwidth = prop.width;
697	fheight = prop.height;	778	fheight = prop.height;
…		…
747	prop, XA_STRING, 8, PropModeReplace,	828	prop, XA_STRING, 8, PropModeReplace,
748	(const unsigned char *)str, len >= 0 ? len : strlen (str));	829	(const unsigned char *)str, len >= 0 ? len : strlen (str));
749	}	830	}
750		831
751	void	832	void
		833	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		834	{
		835	XTextProperty ct;
		836
		837	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		838	{
		839	XSetTextProperty (dpy, parent[0], &ct, prop);
		840	XFree (ct.value);
		841	}
		842	}
		843
		844	void
752	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	845	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753	{	846	{
754	wchar_t *ws = rxvt_mbstowcs (str, len);	847	wchar_t *ws = rxvt_mbstowcs (str, len);
755	char *s = rxvt_wcstoutf8 (ws);	848	char *s = rxvt_wcstoutf8 (ws);
756		849
…		…
766	/----------------------------------------------------------------------/	859	/----------------------------------------------------------------------/
767	/* xterm sequences - title, iconName, color (exptl) */	860	/* xterm sequences - title, iconName, color (exptl) */
768	void	861	void
769	rxvt_term::set_title (const char *str)	862	rxvt_term::set_title (const char *str)
770	{	863	{
771	set_string_property (XA_WM_NAME, str);	864	set_mbstring_property (XA_WM_NAME, str);
772	#if ENABLE_EWMH	865	#if ENABLE_EWMH
773	set_utf8_property (xa[XA_NET_WM_NAME], str);	866	set_utf8_property (xa[XA_NET_WM_NAME], str);
774	#endif	867	#endif
775	}	868	}
776		869
777	void	870	void
778	rxvt_term::set_icon_name (const char *str)	871	rxvt_term::set_icon_name (const char *str)
779	{	872	{
780	set_string_property (XA_WM_ICON_NAME, str);	873	set_mbstring_property (XA_WM_ICON_NAME, str);
781	#if ENABLE_EWMH	874	#if ENABLE_EWMH
782	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	875	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783	#endif	876	#endif
784	}	877	}
785		878
…		…
857	void	950	void
858	rxvt_term::set_colorfgbg ()	951	rxvt_term::set_colorfgbg ()
859	{	952	{
860	unsigned int i;	953	unsigned int i;
861	const char *xpmb = "";	954	const char *xpmb = "";
862	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	955	char fstr[] = "default";
		956	char bstr[] = "default";
863		957
864	strcpy (fstr, "default");
865	strcpy (bstr, "default");
866	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
867	if (pix_colors[Color_fg] == pix_colors[i])	959	if (pix_colors[Color_fg] == pix_colors[i])
868	{	960	{
869	sprintf (fstr, "%d", (i - Color_Black));	961	sprintf (fstr, "%d", i - Color_Black);
870	break;	962	break;
871	}	963	}
872		964
873	for (i = Color_Black; i <= Color_White; i++)	965	for (i = Color_Black; i <= Color_White; i++)
874	if (pix_colors[Color_bg] == pix_colors[i])	966	if (pix_colors[Color_bg] == pix_colors[i])
875	{	967	{
876	sprintf (bstr, "%d", (i - Color_Black));	968	sprintf (bstr, "%d", i - Color_Black);
877	#ifdef BG_IMAGE_FROM_FILE	969	#ifdef BG_IMAGE_FROM_FILE
878	xpmb = "default;";	970	xpmb = "default;";
879	#endif	971	#endif
880	break;	972	break;
881	}	973	}
…		…
984	XMoveResizeWindow (dpy, vt,	1076	XMoveResizeWindow (dpy, vt,
985	window_vt_x, window_vt_y,	1077	window_vt_x, window_vt_y,
986	width, height);	1078	width, height);
987		1079
988	#ifdef HAVE_BG_PIXMAP	1080	#ifdef HAVE_BG_PIXMAP
989	if (bgPixmap.window_size_sensitive ())	1081	if (bg_window_size_sensitive ())
990	update_background ();	1082	update_background ();
991	#endif	1083	#endif
992	}	1084	}
993		1085
994	if (fix_screen \|\| old_height == 0)	1086	if (fix_screen \|\| old_height == 0)
995	scr_reset ();	1087	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		1088
1006	#ifdef USE_XIM	1089	#ifdef USE_XIM
1007	IMSetPosition ();	1090	IMSetPosition ();
1008	#endif	1091	#endif
1009	}	1092	}
…		…
1075		1158
1076	/* Checking whether input method is running. */	1159	/* Checking whether input method is running. */
1077	bool	1160	bool
1078	rxvt_term::IMisRunning ()	1161	rxvt_term::IMisRunning ()
1079	{	1162	{
1080	char *p;
1081	Atom atom;	1163	Atom atom;
1082	Window win;	1164	Window win;
1083	char server[IMBUFSIZ];	1165	char server[IMBUFSIZ];
1084		1166
1085	/* get current locale modifier */	1167	/* get current locale modifier */
1086	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1168	if (char *p = XSetLocaleModifiers (0))
1087	{	1169	{
1088	strcpy (server, "@server=");	1170	strcpy (server, "@server=");
1089	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1171	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1090		1172
1091	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1173	if (p = strchr (server + 1, '@')) /* first one only */
1092	*p = '\0';	1174	*p = '\0';
1093		1175
1094	atom = XInternAtom (dpy, server, False);	1176	atom = XInternAtom (dpy, server, False);
1095	win = XGetSelectionOwner (dpy, atom);	1177	win = XGetSelectionOwner (dpy, atom);
1096		1178
…		…
1163		1245
1164	term->make_current ();	1246	term->make_current ();
1165		1247
1166	if (text)	1248	if (text)
1167	{	1249	{
1168	void *str;	1250	wchar_t *str;
1169		1251
1170	if (!text->encoding_is_wchar && text->string.multi_byte)	1252	if (!text->encoding_is_wchar && text->string.multi_byte)
1171	{	1253	{
1172	// of course, X makes it ugly again	1254	// of course, X makes it ugly again
1173	if (term->rs[Rs_imLocale])	1255	if (term->rs[Rs_imLocale])
1174	SET_LOCALE (term->rs[Rs_imLocale]);	1256	SET_LOCALE (term->rs[Rs_imLocale]);
1175		1257
1176	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1258	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1177	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1259	mbstowcs (str, text->string.multi_byte, text->length + 1);
1178		1260
1179	if (term->rs[Rs_imLocale])	1261	if (term->rs[Rs_imLocale])
1180	SET_LOCALE (term->locale);	1262	SET_LOCALE (term->locale);
1181	}	1263	}
1182	else	1264	else
1183	str = (void *)text->string.wide_char;	1265	str = text->string.wide_char;
1184		1266
1185	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1267	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1186	DT_INT, call_data->caret,	1268	DT_INT, call_data->caret,
1187	DT_INT, call_data->chg_first,	1269	DT_INT, call_data->chg_first,
1188	DT_INT, call_data->chg_length,	1270	DT_INT, call_data->chg_length,
…		…
1259	p = pet[pi];	1341	p = pet[pi];
1260		1342
1261	if (!p)	1343	if (!p)
1262	continue;	1344	continue;
1263		1345
1264	s = rxvt_splitcommastring (p);	1346	s = rxvt_strsplit (',', p);
1265		1347
1266	for (i = found = 0; !found && s[i]; i++)	1348	for (i = found = 0; !found && s[i]; i++)
1267	{	1349	{
1268	if (!strcmp (s[i], "OverTheSpot"))	1350	if (!strcmp (s[i], "OverTheSpot"))
1269	input_style = XIMPreeditPosition \| XIMStatusNothing;	1351	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1281	input_style = XIMPreeditNothing \| XIMStatusNothing;	1363	input_style = XIMPreeditNothing \| XIMStatusNothing;
1282		1364
1283	for (j = 0; j < xim_styles->count_styles; j++)	1365	for (j = 0; j < xim_styles->count_styles; j++)
1284	if (input_style == xim_styles->supported_styles[j])	1366	if (input_style == xim_styles->supported_styles[j])
1285	{	1367	{
1286	rxvt_freecommastring (s);	1368	rxvt_free_strsplit (s);
1287		1369
1288	found = 1;	1370	found = 1;
1289	goto foundpet;	1371	goto foundpet;
1290	}	1372	}
1291		1373
1292	}	1374	}
1293		1375
1294	rxvt_freecommastring (s);	1376	rxvt_free_strsplit (s);
1295	}	1377	}
1296		1378
1297	foundpet:	1379	foundpet:
1298		1380
1299	XFree (xim_styles);	1381	XFree (xim_styles);
…		…
1455	p = rs[Rs_inputMethod];	1537	p = rs[Rs_inputMethod];
1456	if (p && *p)	1538	if (p && *p)
1457	{	1539	{
1458	bool found = false;	1540	bool found = false;
1459		1541
1460	s = rxvt_splitcommastring (p);	1542	s = rxvt_strsplit (',', p);
1461		1543
1462	for (i = 0; s[i]; i++)	1544	for (i = 0; s[i]; i++)
1463	{	1545	{
1464	if (*s[i])	1546	if (*s[i])
1465	{	1547	{
…		…
1471	break;	1553	break;
1472	}	1554	}
1473	}	1555	}
1474	}	1556	}
1475		1557
1476	rxvt_freecommastring (s);	1558	rxvt_free_strsplit (s);
1477		1559
1478	if (found)	1560	if (found)
1479	goto done;	1561	goto done;
1480	}	1562	}
1481		1563
…		…
1542	void	1624	void
1543	rxvt_term::get_window_origin (int &x, int &y)	1625	rxvt_term::get_window_origin (int &x, int &y)
1544	{	1626	{
1545	Window cr;	1627	Window cr;
1546	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1628	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1547	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1548	}	1629	}
1549		1630
1550	Pixmap	1631	Pixmap
1551	rxvt_term::get_pixmap_property (int prop_id)	1632	rxvt_term::get_pixmap_property (Atom property)
1552	{	1633	{
1553	if (prop_id > 0 && prop_id < NUM_XA)	1634	Pixmap pixmap = None;
1554	if (xa[prop_id])	1635
1555	{
1556	int aformat;	1636	int aformat;
1557	unsigned long nitems, bytes_after;	1637	unsigned long nitems, bytes_after;
1558	Atom atype;	1638	Atom atype;
1559	unsigned char *prop = NULL;	1639	unsigned char *prop;
1560	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1640	int result = XGetWindowProperty (dpy, display->root, property,
1561	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1641	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1562	&nitems, &bytes_after, &prop);	1642	&nitems, &bytes_after, &prop);
1563	if (result == Success && prop && atype == XA_PIXMAP)	1643	if (result == Success)
		1644	{
		1645	if (atype == XA_PIXMAP)
1564	return (Pixmap )prop;	1646	pixmap = (Pixmap )prop;
		1647	XFree (prop);
1565	}	1648	}
1566		1649
1567	return None;	1650	return pixmap;
1568	}	1651	}
1569		1652
1570	#ifdef HAVE_BG_PIXMAP	1653	#ifdef HAVE_BG_PIXMAP
1571	# if TRACE_PIXMAPS
1572	# undef update_background
1573	void
1574	rxvt_term::trace_update_background (const char *file, int line)
1575	{
1576	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1577	update_background ();
1578	}
1579	# endif
1580		1654
1581	void	1655	void
1582	rxvt_term::update_background ()	1656	rxvt_term::update_background ()
1583	{	1657	{
1584	if (update_background_ev.is_active ())	1658	if (update_background_ev.is_active ())
1585	return;	1659	return;
1586		1660
1587	bgPixmap.invalidate ();	1661	bg_invalidate ();
1588		1662
1589	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1663	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1590		1664
1591	if (to_wait <= 0.)	1665	if (to_wait <= 0.)
1592	bgPixmap.render ();	1666	bg_render ();
1593	else	1667	else
1594	update_background_ev.start (to_wait);	1668	update_background_ev.start (to_wait);
1595	}	1669	}
1596		1670
1597	void	1671	void
1598	rxvt_term::update_background_cb (ev::timer &w, int revents)	1672	rxvt_term::update_background_cb (ev::timer &w, int revents)
1599	{	1673	{
1600	make_current ();	1674	make_current ();
1601		1675
1602	update_background_ev.stop ();	1676	update_background_ev.stop ();
1603	bgPixmap.render ();	1677	bg_render ();
1604	refresh_check ();	1678	refresh_check ();
1605	}	1679	}
1606		1680
1607	#endif /* HAVE_BG_PIXMAP */	1681	#endif /* HAVE_BG_PIXMAP */
1608		1682

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.315 by root, Wed Nov 5 12:29:26 2008 UTC vs. Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.315 by root, Wed Nov 5 12:29:26 2008 UTC vs.
Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC