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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 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));
…		…
227	delete fontset[0];	228	delete fontset[0];
228		229
229	#ifdef HAVE_BG_PIXMAP	230	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	231	bgPixmap.destroy ();
231	#endif	232	#endif
		233	#ifdef HAVE_AFTERIMAGE
		234	if (asv)
		235	destroy_asvisual (asv, 0);
		236	if (asimman)
		237	destroy_image_manager (asimman, 0);
		238	#endif
232		239
233	if (display)	240	if (display)
234	{	241	{
235	selection_clear ();	242	selection_clear ();
		243	selection_clear (true);
236		244
237	#ifdef USE_XIM	245	#ifdef USE_XIM
238	im_destroy ();	246	im_destroy ();
239	#endif	247	#endif
240	scrollBar.destroy ();	248	scrollBar.destroy ();
…		…
265	/* clear all resources */	273	/* clear all resources */
266	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
267	free (allocated [i]);	275	free (allocated [i]);
268		276
269	free (selection.text);	277	free (selection.text);
		278	free (selection.clip_text);
270	// TODO: manage env vars in child only(!)	279	// TODO: manage env vars in child only(!)
271	free (env_display);	280	free (env_display);
272	free (env_term);	281	free (env_term);
273	free (locale);	282	free (locale);
274	free (v_buffer);	283	free (v_buffer);
…		…
350	make_current ();	359	make_current ();
351		360
352	delete this;	361	delete this;
353	}	362	}
354		363
		364	void
		365	rxvt_term::set_option (uint8_t opt, bool set)
		366	{
		367	if (!opt)
		368	return;
		369
		370	uint8_t mask = 1 << (opt & 7);
		371	uint8_t &val = options [opt >> 3];
		372
		373	val = val & ~mask \| (set ? mask : 0);
		374	}
		375
355	/----------------------------------------------------------------------/	376	/----------------------------------------------------------------------/
356	/*	377	/*
357	* Exit gracefully, clearing the utmp entry and restoring tty attributes	378	* Exit gracefully, clearing the utmp entry and restoring tty attributes
358	* TODO: if debugging, this should free up any known resources if we can	379	* TODO: if debugging, this should free up any known resources if we can
359	*/	380	*/
…		…
371	print_x_error (Display dpy, XErrorEvent event)	392	print_x_error (Display dpy, XErrorEvent event)
372	{	393	{
373	char buffer[BUFSIZ];	394	char buffer[BUFSIZ];
374	char mesg[BUFSIZ];	395	char mesg[BUFSIZ];
375	char number[32];	396	char number[32];
376	char *mtype = "XlibMessage";	397	const char mtype[] = "XlibMessage";
377	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	398	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	399	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379	rxvt_warn ("An X Error occured, trying to continue after report.\n");	400	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
380	rxvt_warn ("%s: %s\n", mesg, buffer);	401	rxvt_warn ("%s: %s\n", mesg, buffer);
381	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	402	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383	sprintf(number, "%d", event->request_code);	404	sprintf(number, "%d", event->request_code);
384	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	405	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385	rxvt_warn ("(which is %s)\n", buffer);	406	rxvt_warn ("(which is %s)\n", buffer);
386	if (event->request_code >= 128) {	407	if (event->request_code >= 128) {
387	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	408	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388	mesg, BUFSIZ);	409	mesg, BUFSIZ);
389	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390	}	411	}
391	if ((event->error_code == BadWindow) \|\|	412	if ((event->error_code == BadWindow) \|\|
392	(event->error_code == BadPixmap) \|\|	413	(event->error_code == BadPixmap) \|\|
393	(event->error_code == BadCursor) \|\|	414	(event->error_code == BadCursor) \|\|
394	(event->error_code == BadFont) \|\|	415	(event->error_code == BadFont) \|\|
395	(event->error_code == BadDrawable) \|\|	416	(event->error_code == BadDrawable) \|\|
396	(event->error_code == BadColor) \|\|	417	(event->error_code == BadColor) \|\|
397	(event->error_code == BadGC) \|\|	418	(event->error_code == BadGC) \|\|
398	(event->error_code == BadIDChoice) \|\|	419	(event->error_code == BadIDChoice) \|\|
399	(event->error_code == BadValue) \|\|	420	(event->error_code == BadValue) \|\|
400	(event->error_code == BadAtom)) {	421	(event->error_code == BadAtom)) {
401	if (event->error_code == BadValue)	422	if (event->error_code == BadValue)
402	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	423	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403	mesg, BUFSIZ);	424	mesg, BUFSIZ);
404	else if (event->error_code == BadAtom)	425	else if (event->error_code == BadAtom)
405	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	426	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406	mesg, BUFSIZ);	427	mesg, BUFSIZ);
407	else	428	else
408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409	mesg, BUFSIZ);	430	mesg, BUFSIZ);
410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411	}	432	}
412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413	mesg, BUFSIZ);	434	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415	}	436	}
416	#endif	437	#endif
417		438
418	int	439	int
…		…
465	rxvt_emergency_cleanup ();	486	rxvt_emergency_cleanup ();
466	w.stop ();	487	w.stop ();
467	kill (getpid (), w.signum);	488	kill (getpid (), w.signum);
468	}	489	}
469		490
		491	static void
		492	rxvt_get_ttymode (struct termios *tio)
		493	{
		494	if (tcgetattr (STDIN_FILENO, tio) < 0)
		495	memset (tio, 0, sizeof (struct termios));
		496
		497	for (int i = 0; i < NCCS; i++)
		498	tio->c_cc[i] = VDISABLE;
		499
		500	tio->c_cc[VINTR] = CINTR;
		501	tio->c_cc[VQUIT] = CQUIT;
		502	tio->c_cc[VERASE] = CERASE;
		503	#ifdef VERASE2
		504	tio->c_cc[VERASE2] = CERASE2;
		505	#endif
		506	tio->c_cc[VKILL] = CKILL;
		507	tio->c_cc[VEOF] = CEOF;
		508	tio->c_cc[VSTART] = CSTART;
		509	tio->c_cc[VSTOP] = CSTOP;
		510	tio->c_cc[VSUSP] = CSUSP;
		511	# ifdef VDSUSP
		512	tio->c_cc[VDSUSP] = CDSUSP;
		513	# endif
		514	# ifdef VREPRINT
		515	tio->c_cc[VREPRINT] = CRPRNT;
		516	# endif
		517	# ifdef VDISCRD
		518	tio->c_cc[VDISCRD] = CFLUSH;
		519	# endif
		520	# ifdef VWERSE
		521	tio->c_cc[VWERSE] = CWERASE;
		522	# endif
		523	# ifdef VLNEXT
		524	tio->c_cc[VLNEXT] = CLNEXT;
		525	# endif
		526	# ifdef VSTATUS
		527	tio->c_cc[VSTATUS] = CSTATUS;
		528	# endif
		529
		530	# if VMIN != VEOF
		531	tio->c_cc[VMIN] = 1;
		532	# endif
		533	# if VTIME != VEOL
		534	tio->c_cc[VTIME] = 0;
		535	# endif
		536
		537	/* input modes */
		538	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		539	# ifdef IMAXBEL
		540	\| IMAXBEL
		541	# endif
		542	\| IXON);
		543
		544	/* output modes */
		545	tio->c_oflag = (OPOST \| ONLCR);
		546
		547	/* control modes */
		548	tio->c_cflag = (CS8 \| CREAD);
		549
		550	/* local modes */
		551	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		552	# if defined (ECHOCTL) && defined (ECHOKE)
		553	\| ECHOCTL \| ECHOKE
		554	# endif
		555	\| ECHOE \| ECHOK);
		556	}
		557
470	char **rxvt_environ; // startup environment	558	char **rxvt_environ; // startup environment
471		559
472	void	560	void
473	rxvt_init ()	561	rxvt_init ()
474	{	562	{
475	ptytty::init ();	563	assert (("fontMask must not overlap other RS masks",
		564	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
476		565
		566	rxvt_get_ttymode (&rxvt_term::def_tio);
		567
		568	// get rid of stdin/stdout as we don't need them, to free resources
		569	dup2 (STDERR_FILENO, STDIN_FILENO);
		570	dup2 (STDERR_FILENO, STDOUT_FILENO);
		571
477	if (!ev_default_loop (0))	572	if (!ev_default_loop ())
478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	573	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479		574
480	rxvt_environ = environ;	575	rxvt_environ = environ;
481		576
482	signal (SIGHUP, SIG_IGN);	577	signal (SIGHUP, SIG_IGN);
483	signal (SIGPIPE, SIG_IGN);	578	signal (SIGPIPE, SIG_IGN);
484		579
485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	580	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486	sig_handlers.sw_int.start (SIGINT); ev_unref ();	581	sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
489	/* signal (SIGURG, SIG_DFL); */
490		582
491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	583	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492	// TODO: handle this with exceptions and tolerate the memory loss	584	// TODO: handle this with exceptions and tolerate the memory loss
493	XSetIOErrorHandler (rxvt_xioerror_handler);	585	XSetIOErrorHandler (rxvt_xioerror_handler);
494		586
…		…
522	if (rs[Rs_geometry])	614	if (rs[Rs_geometry])
523	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	615	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
524		616
525	if (flags & WidthValue)	617	if (flags & WidthValue)
526	{	618	{
		619	if (!w)
		620	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		621
527	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	622	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
528	szHint.flags \|= USSize;	623	szHint.flags \|= USSize;
529	}	624	}
530		625
531	if (flags & HeightValue)	626	if (flags & HeightValue)
532	{	627	{
		628	if (!h)
		629	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		630
533	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	631	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
534	szHint.flags \|= USSize;	632	szHint.flags \|= USSize;
535	}	633	}
536		634
537	if (flags & XValue)	635	if (flags & XValue)
538	{	636	{
…		…
559	szHint.win_gravity = SouthEastGravity;	657	szHint.win_gravity = SouthEastGravity;
560	else	658	else
561	szHint.win_gravity = SouthWestGravity;	659	szHint.win_gravity = SouthWestGravity;
562	}	660	}
563	}	661	}
564
565	if (!szHint.width \|\| !szHint.height)
566	rxvt_fatal ("window width or height must not be zero, aborting.\n");
567	}	662	}
568		663
569	/* TODO: BOUNDS */	664	/* TODO: BOUNDS */
570	width = ncol * fwidth;	665	width = ncol * fwidth;
571	height = nrow * fheight;	666	height = nrow * fheight;
…		…
616	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	711	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
617		712
618	if (recalc_y)	713	if (recalc_y)
619	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	714	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
620		715
621	ncol = width / fwidth;	716	ncol = width / fwidth;
622	nrow = height / fheight;	717	nrow = height / fheight;
623	}	718	}
624		719
625	/----------------------------------------------------------------------/	720	/----------------------------------------------------------------------/
626	/*	721	/*
…		…
637		732
638	ws.ws_col = ncol;	733	ws.ws_col = ncol;
639	ws.ws_row = nrow;	734	ws.ws_row = nrow;
640	ws.ws_xpixel = width;	735	ws.ws_xpixel = width;
641	ws.ws_ypixel = height;	736	ws.ws_ypixel = height;
642	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	737	ioctl (pty->pty, TIOCSWINSZ, &ws);
643		738
644	#if 0	739	#if 0
645	// TIOCSWINSZ is supposed to do this automatically and correctly	740	// TIOCSWINSZ is supposed to do this automatically and correctly
646	if (cmd_pid) /* force through to the command */	741	if (cmd_pid) /* force through to the command */
647	kill (-cmd_pid, SIGWINCH);	742	kill (-cmd_pid, SIGWINCH);
…		…
677	#endif	772	#endif
678		773
679	delete fontset[0];	774	delete fontset[0];
680	fontset[0] = fs;	775	fontset[0] = fs;
681		776
682	prop = (*fs)[1]->properties ();	777	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
683	prop.height += lineSpace;	778	prop.height += lineSpace;
		779	prop.width += letterSpace;
684		780
685	fs->set_prop (prop, false);	781	fs->set_prop (prop, false);
686		782
687	fwidth = prop.width;	783	fwidth = prop.width;
688	fheight = prop.height;	784	fheight = prop.height;
…		…
738	prop, XA_STRING, 8, PropModeReplace,	834	prop, XA_STRING, 8, PropModeReplace,
739	(const unsigned char *)str, len >= 0 ? len : strlen (str));	835	(const unsigned char *)str, len >= 0 ? len : strlen (str));
740	}	836	}
741		837
742	void	838	void
		839	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		840	{
		841	XTextProperty ct;
		842
		843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		844	{
		845	XSetTextProperty (dpy, parent[0], &ct, prop);
		846	XFree (ct.value);
		847	}
		848	}
		849
		850	void
743	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
744	{	852	{
745	wchar_t *ws = rxvt_mbstowcs (str, len);	853	wchar_t *ws = rxvt_mbstowcs (str, len);
746	char *s = rxvt_wcstoutf8 (ws);	854	char *s = rxvt_wcstoutf8 (ws);
747		855
…		…
757	/----------------------------------------------------------------------/	865	/----------------------------------------------------------------------/
758	/* xterm sequences - title, iconName, color (exptl) */	866	/* xterm sequences - title, iconName, color (exptl) */
759	void	867	void
760	rxvt_term::set_title (const char *str)	868	rxvt_term::set_title (const char *str)
761	{	869	{
762	set_string_property (XA_WM_NAME, str);	870	set_mbstring_property (XA_WM_NAME, str);
763	#if ENABLE_EWMH	871	#if ENABLE_EWMH
764	set_utf8_property (xa[XA_NET_WM_NAME], str);	872	set_utf8_property (xa[XA_NET_WM_NAME], str);
765	#endif	873	#endif
766	}	874	}
767		875
768	void	876	void
769	rxvt_term::set_icon_name (const char *str)	877	rxvt_term::set_icon_name (const char *str)
770	{	878	{
771	set_string_property (XA_WM_ICON_NAME, str);	879	set_mbstring_property (XA_WM_ICON_NAME, str);
772	#if ENABLE_EWMH	880	#if ENABLE_EWMH
773	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	881	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
774	#endif	882	#endif
775	}	883	}
776		884
…		…
848	void	956	void
849	rxvt_term::set_colorfgbg ()	957	rxvt_term::set_colorfgbg ()
850	{	958	{
851	unsigned int i;	959	unsigned int i;
852	const char *xpmb = "";	960	const char *xpmb = "";
853	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	961	char fstr[] = "default";
		962	char bstr[] = "default";
854		963
855	strcpy (fstr, "default");
856	strcpy (bstr, "default");
857	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
858	if (pix_colors[Color_fg] == pix_colors[i])	965	if (pix_colors[Color_fg] == pix_colors[i])
859	{	966	{
860	sprintf (fstr, "%d", (i - Color_Black));	967	sprintf (fstr, "%d", i - Color_Black);
861	break;	968	break;
862	}	969	}
863		970
864	for (i = Color_Black; i <= Color_White; i++)	971	for (i = Color_Black; i <= Color_White; i++)
865	if (pix_colors[Color_bg] == pix_colors[i])	972	if (pix_colors[Color_bg] == pix_colors[i])
866	{	973	{
867	sprintf (bstr, "%d", (i - Color_Black));	974	sprintf (bstr, "%d", i - Color_Black);
868	#ifdef BG_IMAGE_FROM_FILE	975	#ifdef BG_IMAGE_FROM_FILE
869	xpmb = "default;";	976	xpmb = "default;";
870	#endif	977	#endif
871	break;	978	break;
872	}	979	}
…		…
902	int old_width = szHint.width;	1009	int old_width = szHint.width;
903	int old_height = szHint.height;	1010	int old_height = szHint.height;
904		1011
905	window_calc (newwidth, newheight);	1012	window_calc (newwidth, newheight);
906		1013
907	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1014	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1015
		1016	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1017	if (set_hint)
		1018	{
		1019	szHint.flags &= ~(PBaseSize \| PResizeInc);
908	XSetWMNormalHints (dpy, parent[0], &szHint);	1020	XSetWMNormalHints (dpy, parent[0], &szHint);
		1021	szHint.flags \|= PBaseSize \| PResizeInc;
		1022	}
909		1023
910	if (!ignoreparent)	1024	if (!ignoreparent)
911	{	1025	{
912	#ifdef SMART_RESIZE	1026	#ifdef SMART_RESIZE
913	/*	1027	/*
…		…
953	#else	1067	#else
954	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1068	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
955	#endif	1069	#endif
956	}	1070	}
957		1071
		1072	if (set_hint)
		1073	XSetWMNormalHints (dpy, parent[0], &szHint);
		1074
958	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1075	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
959		1076
960	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1077	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
961	{	1078	{
962	if (scrollBar.state)	1079	if (scrollBar.state)
…		…
968		1085
969	#ifdef HAVE_BG_PIXMAP	1086	#ifdef HAVE_BG_PIXMAP
970	if (bgPixmap.window_size_sensitive ())	1087	if (bgPixmap.window_size_sensitive ())
971	update_background ();	1088	update_background ();
972	#endif	1089	#endif
973
974	scr_clear ();
975	}	1090	}
976		1091
977	if (fix_screen \|\| old_height == 0)	1092	if (fix_screen \|\| old_height == 0)
978	scr_reset ();	1093	scr_reset ();
979
980	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
981	//scr_touch (false);
982
983	#ifdef HAVE_BG_PIXMAP
984	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
985	// if (bgPixmap.pixmap)
986	// scr_touch (false);
987	#endif
988		1094
989	#ifdef USE_XIM	1095	#ifdef USE_XIM
990	IMSetPosition ();	1096	IMSetPosition ();
991	#endif	1097	#endif
992	}	1098	}
…		…
1058		1164
1059	/* Checking whether input method is running. */	1165	/* Checking whether input method is running. */
1060	bool	1166	bool
1061	rxvt_term::IMisRunning ()	1167	rxvt_term::IMisRunning ()
1062	{	1168	{
1063	char *p;
1064	Atom atom;	1169	Atom atom;
1065	Window win;	1170	Window win;
1066	char server[IMBUFSIZ];	1171	char server[IMBUFSIZ];
1067		1172
1068	/* get current locale modifier */	1173	/* get current locale modifier */
1069	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1174	if (char *p = XSetLocaleModifiers (0))
1070	{	1175	{
1071	strcpy (server, "@server=");	1176	strcpy (server, "@server=");
1072	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1177	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1073		1178
1074	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1179	if (p = strchr (server + 1, '@')) /* first one only */
1075	*p = '\0';	1180	*p = '\0';
1076		1181
1077	atom = XInternAtom (dpy, server, False);	1182	atom = XInternAtom (dpy, server, False);
1078	win = XGetSelectionOwner (dpy, atom);	1183	win = XGetSelectionOwner (dpy, atom);
1079		1184
…		…
1146		1251
1147	term->make_current ();	1252	term->make_current ();
1148		1253
1149	if (text)	1254	if (text)
1150	{	1255	{
1151	void *str;	1256	wchar_t *str;
1152		1257
1153	if (!text->encoding_is_wchar && text->string.multi_byte)	1258	if (!text->encoding_is_wchar && text->string.multi_byte)
1154	{	1259	{
1155	// of course, X makes it ugly again	1260	// of course, X makes it ugly again
1156	if (term->rs[Rs_imLocale])	1261	if (term->rs[Rs_imLocale])
1157	SET_LOCALE (term->rs[Rs_imLocale]);	1262	SET_LOCALE (term->rs[Rs_imLocale]);
1158		1263
1159	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1264	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1160	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1265	mbstowcs (str, text->string.multi_byte, text->length + 1);
1161		1266
1162	if (term->rs[Rs_imLocale])	1267	if (term->rs[Rs_imLocale])
1163	SET_LOCALE (term->locale);	1268	SET_LOCALE (term->locale);
1164	}	1269	}
1165	else	1270	else
1166	str = (void *)text->string.wide_char;	1271	str = text->string.wide_char;
1167		1272
1168	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1273	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1169	DT_INT, call_data->caret,	1274	DT_INT, call_data->caret,
1170	DT_INT, call_data->chg_first,	1275	DT_INT, call_data->chg_first,
1171	DT_INT, call_data->chg_length,	1276	DT_INT, call_data->chg_length,
…		…
1242	p = pet[pi];	1347	p = pet[pi];
1243		1348
1244	if (!p)	1349	if (!p)
1245	continue;	1350	continue;
1246		1351
1247	s = rxvt_splitcommastring (p);	1352	s = rxvt_strsplit (',', p);
1248		1353
1249	for (i = found = 0; !found && s[i]; i++)	1354	for (i = found = 0; !found && s[i]; i++)
1250	{	1355	{
1251	if (!strcmp (s[i], "OverTheSpot"))	1356	if (!strcmp (s[i], "OverTheSpot"))
1252	input_style = XIMPreeditPosition \| XIMStatusNothing;	1357	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1264	input_style = XIMPreeditNothing \| XIMStatusNothing;	1369	input_style = XIMPreeditNothing \| XIMStatusNothing;
1265		1370
1266	for (j = 0; j < xim_styles->count_styles; j++)	1371	for (j = 0; j < xim_styles->count_styles; j++)
1267	if (input_style == xim_styles->supported_styles[j])	1372	if (input_style == xim_styles->supported_styles[j])
1268	{	1373	{
1269	rxvt_freecommastring (s);	1374	rxvt_free_strsplit (s);
1270		1375
1271	found = 1;	1376	found = 1;
1272	goto foundpet;	1377	goto foundpet;
1273	}	1378	}
1274		1379
1275	}	1380	}
1276		1381
1277	rxvt_freecommastring (s);	1382	rxvt_free_strsplit (s);
1278	}	1383	}
1279		1384
1280	foundpet:	1385	foundpet:
1281		1386
1282	XFree (xim_styles);	1387	XFree (xim_styles);
…		…
1438	p = rs[Rs_inputMethod];	1543	p = rs[Rs_inputMethod];
1439	if (p && *p)	1544	if (p && *p)
1440	{	1545	{
1441	bool found = false;	1546	bool found = false;
1442		1547
1443	s = rxvt_splitcommastring (p);	1548	s = rxvt_strsplit (',', p);
1444		1549
1445	for (i = 0; s[i]; i++)	1550	for (i = 0; s[i]; i++)
1446	{	1551	{
1447	if (*s[i])	1552	if (*s[i])
1448	{	1553	{
…		…
1454	break;	1559	break;
1455	}	1560	}
1456	}	1561	}
1457	}	1562	}
1458		1563
1459	rxvt_freecommastring (s);	1564	rxvt_free_strsplit (s);
1460		1565
1461	if (found)	1566	if (found)
1462	goto done;	1567	goto done;
1463	}	1568	}
1464		1569
…		…
1525	void	1630	void
1526	rxvt_term::get_window_origin (int &x, int &y)	1631	rxvt_term::get_window_origin (int &x, int &y)
1527	{	1632	{
1528	Window cr;	1633	Window cr;
1529	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1634	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1530	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1531	}	1635	}
1532		1636
1533	Pixmap	1637	Pixmap
1534	rxvt_term::get_pixmap_property (int prop_id)	1638	rxvt_term::get_pixmap_property (Atom property)
1535	{	1639	{
1536	if (prop_id > 0 && prop_id < NUM_XA)	1640	Pixmap pixmap = None;
1537	if (xa[prop_id])	1641
1538	{
1539	int aformat;	1642	int aformat;
1540	unsigned long nitems, bytes_after;	1643	unsigned long nitems, bytes_after;
1541	Atom atype;	1644	Atom atype;
1542	unsigned char *prop = NULL;	1645	unsigned char *prop;
1543	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1646	int result = XGetWindowProperty (dpy, display->root, property,
1544	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1647	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1545	&nitems, &bytes_after, &prop);	1648	&nitems, &bytes_after, &prop);
1546	if (result == Success && prop && atype == XA_PIXMAP)	1649	if (result == Success)
		1650	{
		1651	if (atype == XA_PIXMAP)
1547	return (Pixmap )prop;	1652	pixmap = (Pixmap )prop;
		1653	XFree (prop);
1548	}	1654	}
1549		1655
1550	return None;	1656	return pixmap;
1551	}	1657	}
1552		1658
1553	#ifdef HAVE_BG_PIXMAP	1659	#ifdef HAVE_BG_PIXMAP
1554	# if TRACE_PIXMAPS
1555	# undef update_background
1556	void
1557	rxvt_term::trace_update_background (const char *file, int line)
1558	{
1559	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1560	update_background ();
1561	}
1562	# endif
1563		1660
1564	void	1661	void
1565	rxvt_term::update_background ()	1662	rxvt_term::update_background ()
1566	{	1663	{
1567	if (update_background_ev.is_active ())	1664	if (update_background_ev.is_active ())

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs. Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC