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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.308 by ayin, Tue Feb 19 13:01:32 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	#endif
232		233
233	if (display)	234	if (display)
234	{	235	{
235	selection_clear ();	236	selection_clear ();
		237	selection_clear (true);
236		238
237	#ifdef USE_XIM	239	#ifdef USE_XIM
238	im_destroy ();	240	im_destroy ();
239	#endif	241	#endif
240	scrollBar.destroy ();	242	scrollBar.destroy ();
…		…
265	/* clear all resources */	267	/* clear all resources */
266	for (int i = 0; i < allocated.size (); i++)	268	for (int i = 0; i < allocated.size (); i++)
267	free (allocated [i]);	269	free (allocated [i]);
268		270
269	free (selection.text);	271	free (selection.text);
		272	free (selection.clip_text);
270	// TODO: manage env vars in child only(!)	273	// TODO: manage env vars in child only(!)
271	free (env_display);	274	free (env_display);
272	free (env_term);	275	free (env_term);
273	free (locale);	276	free (locale);
274	free (v_buffer);	277	free (v_buffer);
…		…
350	make_current ();	353	make_current ();
351		354
352	delete this;	355	delete this;
353	}	356	}
354		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
355	/----------------------------------------------------------------------/	370	/----------------------------------------------------------------------/
356	/*	371	/*
357	* Exit gracefully, clearing the utmp entry and restoring tty attributes	372	* Exit gracefully, clearing the utmp entry and restoring tty attributes
358	* 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
359	*/	374	*/
…		…
371	print_x_error (Display dpy, XErrorEvent event)	386	print_x_error (Display dpy, XErrorEvent event)
372	{	387	{
373	char buffer[BUFSIZ];	388	char buffer[BUFSIZ];
374	char mesg[BUFSIZ];	389	char mesg[BUFSIZ];
375	char number[32];	390	char number[32];
376	char *mtype = "XlibMessage";	391	const char mtype[] = "XlibMessage";
377	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	392	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	393	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379	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");
380	rxvt_warn ("%s: %s\n", mesg, buffer);	395	rxvt_warn ("%s: %s\n", mesg, buffer);
381	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	396	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	397	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383	sprintf(number, "%d", event->request_code);	398	sprintf(number, "%d", event->request_code);
384	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	399	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385	rxvt_warn ("(which is %s)\n", buffer);	400	rxvt_warn ("(which is %s)\n", buffer);
386	if (event->request_code >= 128) {	401	if (event->request_code >= 128) {
387	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	402	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388	mesg, BUFSIZ);	403	mesg, BUFSIZ);
389	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	404	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390	}	405	}
391	if ((event->error_code == BadWindow) \|\|	406	if ((event->error_code == BadWindow) \|\|
392	(event->error_code == BadPixmap) \|\|	407	(event->error_code == BadPixmap) \|\|
393	(event->error_code == BadCursor) \|\|	408	(event->error_code == BadCursor) \|\|
394	(event->error_code == BadFont) \|\|	409	(event->error_code == BadFont) \|\|
395	(event->error_code == BadDrawable) \|\|	410	(event->error_code == BadDrawable) \|\|
396	(event->error_code == BadColor) \|\|	411	(event->error_code == BadColor) \|\|
397	(event->error_code == BadGC) \|\|	412	(event->error_code == BadGC) \|\|
398	(event->error_code == BadIDChoice) \|\|	413	(event->error_code == BadIDChoice) \|\|
399	(event->error_code == BadValue) \|\|	414	(event->error_code == BadValue) \|\|
400	(event->error_code == BadAtom)) {	415	(event->error_code == BadAtom)) {
401	if (event->error_code == BadValue)	416	if (event->error_code == BadValue)
402	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403	mesg, BUFSIZ);	418	mesg, BUFSIZ);
404	else if (event->error_code == BadAtom)	419	else if (event->error_code == BadAtom)
405	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	420	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406	mesg, BUFSIZ);	421	mesg, BUFSIZ);
407	else	422	else
408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	423	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409	mesg, BUFSIZ);	424	mesg, BUFSIZ);
410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411	}	426	}
412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	427	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413	mesg, BUFSIZ);	428	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	429	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415	}	430	}
416	#endif	431	#endif
417		432
418	int	433	int
…		…
465	rxvt_emergency_cleanup ();	480	rxvt_emergency_cleanup ();
466	w.stop ();	481	w.stop ();
467	kill (getpid (), w.signum);	482	kill (getpid (), w.signum);
468	}	483	}
469		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
470	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
471		553
472	void	554	void
473	rxvt_init ()	555	rxvt_init ()
474	{	556	{
475	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))));
476		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
477	if (!ev_default_loop (0))	566	if (!ev_default_loop ())
478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	567	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479		568
480	rxvt_environ = environ;	569	rxvt_environ = environ;
481		570
482	signal (SIGHUP, SIG_IGN);	571	signal (SIGHUP, SIG_IGN);
483	signal (SIGPIPE, SIG_IGN);	572	signal (SIGPIPE, SIG_IGN);
484		573
485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	574	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486	sig_handlers.sw_int.start (SIGINT); ev_unref ();	575	sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
489	/* signal (SIGURG, SIG_DFL); */
490		576
491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	577	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492	// TODO: handle this with exceptions and tolerate the memory loss	578	// TODO: handle this with exceptions and tolerate the memory loss
493	XSetIOErrorHandler (rxvt_xioerror_handler);	579	XSetIOErrorHandler (rxvt_xioerror_handler);
494		580
…		…
522	if (rs[Rs_geometry])	608	if (rs[Rs_geometry])
523	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	609	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
524		610
525	if (flags & WidthValue)	611	if (flags & WidthValue)
526	{	612	{
		613	if (!w)
		614	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		615
527	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	616	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
528	szHint.flags \|= USSize;	617	szHint.flags \|= USSize;
529	}	618	}
530		619
531	if (flags & HeightValue)	620	if (flags & HeightValue)
532	{	621	{
		622	if (!h)
		623	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		624
533	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	625	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
534	szHint.flags \|= USSize;	626	szHint.flags \|= USSize;
535	}	627	}
536		628
537	if (flags & XValue)	629	if (flags & XValue)
538	{	630	{
…		…
613	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	705	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
614		706
615	if (recalc_y)	707	if (recalc_y)
616	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	708	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
617		709
618	ncol = width / fwidth;	710	ncol = width / fwidth;
619	nrow = height / fheight;	711	nrow = height / fheight;
620	}	712	}
621		713
622	/----------------------------------------------------------------------/	714	/----------------------------------------------------------------------/
623	/*	715	/*
…		…
634		726
635	ws.ws_col = ncol;	727	ws.ws_col = ncol;
636	ws.ws_row = nrow;	728	ws.ws_row = nrow;
637	ws.ws_xpixel = width;	729	ws.ws_xpixel = width;
638	ws.ws_ypixel = height;	730	ws.ws_ypixel = height;
639	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	731	ioctl (pty->pty, TIOCSWINSZ, &ws);
640		732
641	#if 0	733	#if 0
642	// TIOCSWINSZ is supposed to do this automatically and correctly	734	// TIOCSWINSZ is supposed to do this automatically and correctly
643	if (cmd_pid) /* force through to the command */	735	if (cmd_pid) /* force through to the command */
644	kill (-cmd_pid, SIGWINCH);	736	kill (-cmd_pid, SIGWINCH);
…		…
674	#endif	766	#endif
675		767
676	delete fontset[0];	768	delete fontset[0];
677	fontset[0] = fs;	769	fontset[0] = fs;
678		770
679	prop = (*fs)[1]->properties ();	771	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
680	prop.height += lineSpace;	772	prop.height += lineSpace;
		773	prop.width += letterSpace;
681		774
682	fs->set_prop (prop, false);	775	fs->set_prop (prop, false);
683		776
684	fwidth = prop.width;	777	fwidth = prop.width;
685	fheight = prop.height;	778	fheight = prop.height;
…		…
735	prop, XA_STRING, 8, PropModeReplace,	828	prop, XA_STRING, 8, PropModeReplace,
736	(const unsigned char *)str, len >= 0 ? len : strlen (str));	829	(const unsigned char *)str, len >= 0 ? len : strlen (str));
737	}	830	}
738		831
739	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
740	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)
741	{	846	{
742	wchar_t *ws = rxvt_mbstowcs (str, len);	847	wchar_t *ws = rxvt_mbstowcs (str, len);
743	char *s = rxvt_wcstoutf8 (ws);	848	char *s = rxvt_wcstoutf8 (ws);
744		849
…		…
754	/----------------------------------------------------------------------/	859	/----------------------------------------------------------------------/
755	/* xterm sequences - title, iconName, color (exptl) */	860	/* xterm sequences - title, iconName, color (exptl) */
756	void	861	void
757	rxvt_term::set_title (const char *str)	862	rxvt_term::set_title (const char *str)
758	{	863	{
759	set_string_property (XA_WM_NAME, str);	864	set_mbstring_property (XA_WM_NAME, str);
760	#if ENABLE_EWMH	865	#if ENABLE_EWMH
761	set_utf8_property (xa[XA_NET_WM_NAME], str);	866	set_utf8_property (xa[XA_NET_WM_NAME], str);
762	#endif	867	#endif
763	}	868	}
764		869
765	void	870	void
766	rxvt_term::set_icon_name (const char *str)	871	rxvt_term::set_icon_name (const char *str)
767	{	872	{
768	set_string_property (XA_WM_ICON_NAME, str);	873	set_mbstring_property (XA_WM_ICON_NAME, str);
769	#if ENABLE_EWMH	874	#if ENABLE_EWMH
770	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	875	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
771	#endif	876	#endif
772	}	877	}
773		878
…		…
845	void	950	void
846	rxvt_term::set_colorfgbg ()	951	rxvt_term::set_colorfgbg ()
847	{	952	{
848	unsigned int i;	953	unsigned int i;
849	const char *xpmb = "";	954	const char *xpmb = "";
850	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	955	char fstr[] = "default";
		956	char bstr[] = "default";
851		957
852	strcpy (fstr, "default");
853	strcpy (bstr, "default");
854	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
855	if (pix_colors[Color_fg] == pix_colors[i])	959	if (pix_colors[Color_fg] == pix_colors[i])
856	{	960	{
857	sprintf (fstr, "%d", (i - Color_Black));	961	sprintf (fstr, "%d", i - Color_Black);
858	break;	962	break;
859	}	963	}
860		964
861	for (i = Color_Black; i <= Color_White; i++)	965	for (i = Color_Black; i <= Color_White; i++)
862	if (pix_colors[Color_bg] == pix_colors[i])	966	if (pix_colors[Color_bg] == pix_colors[i])
863	{	967	{
864	sprintf (bstr, "%d", (i - Color_Black));	968	sprintf (bstr, "%d", i - Color_Black);
865	#ifdef BG_IMAGE_FROM_FILE	969	#ifdef BG_IMAGE_FROM_FILE
866	xpmb = "default;";	970	xpmb = "default;";
867	#endif	971	#endif
868	break;	972	break;
869	}	973	}
…		…
899	int old_width = szHint.width;	1003	int old_width = szHint.width;
900	int old_height = szHint.height;	1004	int old_height = szHint.height;
901		1005
902	window_calc (newwidth, newheight);	1006	window_calc (newwidth, newheight);
903		1007
904	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1008	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1009
		1010	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1011	if (set_hint)
		1012	{
		1013	szHint.flags &= ~(PBaseSize \| PResizeInc);
905	XSetWMNormalHints (dpy, parent[0], &szHint);	1014	XSetWMNormalHints (dpy, parent[0], &szHint);
		1015	szHint.flags \|= PBaseSize \| PResizeInc;
		1016	}
906		1017
907	if (!ignoreparent)	1018	if (!ignoreparent)
908	{	1019	{
909	#ifdef SMART_RESIZE	1020	#ifdef SMART_RESIZE
910	/*	1021	/*
…		…
950	#else	1061	#else
951	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1062	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
952	#endif	1063	#endif
953	}	1064	}
954		1065
		1066	if (set_hint)
		1067	XSetWMNormalHints (dpy, parent[0], &szHint);
		1068
955	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1069	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
956		1070
957	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1071	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
958	{	1072	{
959	if (scrollBar.state)	1073	if (scrollBar.state)
…		…
962	XMoveResizeWindow (dpy, vt,	1076	XMoveResizeWindow (dpy, vt,
963	window_vt_x, window_vt_y,	1077	window_vt_x, window_vt_y,
964	width, height);	1078	width, height);
965		1079
966	#ifdef HAVE_BG_PIXMAP	1080	#ifdef HAVE_BG_PIXMAP
967	if (bgPixmap.window_size_sensitive ())	1081	if (bg_window_size_sensitive ())
968	update_background ();	1082	update_background ();
969	#endif	1083	#endif
970
971	scr_clear ();
972	}	1084	}
973		1085
974	if (fix_screen \|\| old_height == 0)	1086	if (fix_screen \|\| old_height == 0)
975	scr_reset ();	1087	scr_reset ();
976
977	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
978	//scr_touch (false);
979
980	#ifdef HAVE_BG_PIXMAP
981	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
982	// if (bgPixmap.pixmap)
983	// scr_touch (false);
984	#endif
985		1088
986	#ifdef USE_XIM	1089	#ifdef USE_XIM
987	IMSetPosition ();	1090	IMSetPosition ();
988	#endif	1091	#endif
989	}	1092	}
…		…
1055		1158
1056	/* Checking whether input method is running. */	1159	/* Checking whether input method is running. */
1057	bool	1160	bool
1058	rxvt_term::IMisRunning ()	1161	rxvt_term::IMisRunning ()
1059	{	1162	{
1060	char *p;
1061	Atom atom;	1163	Atom atom;
1062	Window win;	1164	Window win;
1063	char server[IMBUFSIZ];	1165	char server[IMBUFSIZ];
1064		1166
1065	/* get current locale modifier */	1167	/* get current locale modifier */
1066	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1168	if (char *p = XSetLocaleModifiers (0))
1067	{	1169	{
1068	strcpy (server, "@server=");	1170	strcpy (server, "@server=");
1069	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1171	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1070		1172
1071	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1173	if (p = strchr (server + 1, '@')) /* first one only */
1072	*p = '\0';	1174	*p = '\0';
1073		1175
1074	atom = XInternAtom (dpy, server, False);	1176	atom = XInternAtom (dpy, server, False);
1075	win = XGetSelectionOwner (dpy, atom);	1177	win = XGetSelectionOwner (dpy, atom);
1076		1178
…		…
1143		1245
1144	term->make_current ();	1246	term->make_current ();
1145		1247
1146	if (text)	1248	if (text)
1147	{	1249	{
1148	void *str;	1250	wchar_t *str;
1149		1251
1150	if (!text->encoding_is_wchar && text->string.multi_byte)	1252	if (!text->encoding_is_wchar && text->string.multi_byte)
1151	{	1253	{
1152	// of course, X makes it ugly again	1254	// of course, X makes it ugly again
1153	if (term->rs[Rs_imLocale])	1255	if (term->rs[Rs_imLocale])
1154	SET_LOCALE (term->rs[Rs_imLocale]);	1256	SET_LOCALE (term->rs[Rs_imLocale]);
1155		1257
1156	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1258	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1157	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1259	mbstowcs (str, text->string.multi_byte, text->length + 1);
1158		1260
1159	if (term->rs[Rs_imLocale])	1261	if (term->rs[Rs_imLocale])
1160	SET_LOCALE (term->locale);	1262	SET_LOCALE (term->locale);
1161	}	1263	}
1162	else	1264	else
1163	str = (void *)text->string.wide_char;	1265	str = text->string.wide_char;
1164		1266
1165	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1267	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1166	DT_INT, call_data->caret,	1268	DT_INT, call_data->caret,
1167	DT_INT, call_data->chg_first,	1269	DT_INT, call_data->chg_first,
1168	DT_INT, call_data->chg_length,	1270	DT_INT, call_data->chg_length,
…		…
1239	p = pet[pi];	1341	p = pet[pi];
1240		1342
1241	if (!p)	1343	if (!p)
1242	continue;	1344	continue;
1243		1345
1244	s = rxvt_splitcommastring (p);	1346	s = rxvt_strsplit (',', p);
1245		1347
1246	for (i = found = 0; !found && s[i]; i++)	1348	for (i = found = 0; !found && s[i]; i++)
1247	{	1349	{
1248	if (!strcmp (s[i], "OverTheSpot"))	1350	if (!strcmp (s[i], "OverTheSpot"))
1249	input_style = XIMPreeditPosition \| XIMStatusNothing;	1351	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1261	input_style = XIMPreeditNothing \| XIMStatusNothing;	1363	input_style = XIMPreeditNothing \| XIMStatusNothing;
1262		1364
1263	for (j = 0; j < xim_styles->count_styles; j++)	1365	for (j = 0; j < xim_styles->count_styles; j++)
1264	if (input_style == xim_styles->supported_styles[j])	1366	if (input_style == xim_styles->supported_styles[j])
1265	{	1367	{
1266	rxvt_freecommastring (s);	1368	rxvt_free_strsplit (s);
1267		1369
1268	found = 1;	1370	found = 1;
1269	goto foundpet;	1371	goto foundpet;
1270	}	1372	}
1271		1373
1272	}	1374	}
1273		1375
1274	rxvt_freecommastring (s);	1376	rxvt_free_strsplit (s);
1275	}	1377	}
1276		1378
1277	foundpet:	1379	foundpet:
1278		1380
1279	XFree (xim_styles);	1381	XFree (xim_styles);
…		…
1435	p = rs[Rs_inputMethod];	1537	p = rs[Rs_inputMethod];
1436	if (p && *p)	1538	if (p && *p)
1437	{	1539	{
1438	bool found = false;	1540	bool found = false;
1439		1541
1440	s = rxvt_splitcommastring (p);	1542	s = rxvt_strsplit (',', p);
1441		1543
1442	for (i = 0; s[i]; i++)	1544	for (i = 0; s[i]; i++)
1443	{	1545	{
1444	if (*s[i])	1546	if (*s[i])
1445	{	1547	{
…		…
1451	break;	1553	break;
1452	}	1554	}
1453	}	1555	}
1454	}	1556	}
1455		1557
1456	rxvt_freecommastring (s);	1558	rxvt_free_strsplit (s);
1457		1559
1458	if (found)	1560	if (found)
1459	goto done;	1561	goto done;
1460	}	1562	}
1461		1563
…		…
1522	void	1624	void
1523	rxvt_term::get_window_origin (int &x, int &y)	1625	rxvt_term::get_window_origin (int &x, int &y)
1524	{	1626	{
1525	Window cr;	1627	Window cr;
1526	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1628	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1527	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1528	}	1629	}
1529		1630
1530	Pixmap	1631	Pixmap
1531	rxvt_term::get_pixmap_property (int prop_id)	1632	rxvt_term::get_pixmap_property (Atom property)
1532	{	1633	{
1533	if (prop_id > 0 && prop_id < NUM_XA)	1634	Pixmap pixmap = None;
1534	if (xa[prop_id])	1635
1535	{
1536	int aformat;	1636	int aformat;
1537	unsigned long nitems, bytes_after;	1637	unsigned long nitems, bytes_after;
1538	Atom atype;	1638	Atom atype;
1539	unsigned char *prop = NULL;	1639	unsigned char *prop;
1540	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1640	int result = XGetWindowProperty (dpy, display->root, property,
1541	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1641	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1542	&nitems, &bytes_after, &prop);	1642	&nitems, &bytes_after, &prop);
1543	if (result == Success && prop && atype == XA_PIXMAP)	1643	if (result == Success)
		1644	{
		1645	if (atype == XA_PIXMAP)
1544	return (Pixmap )prop;	1646	pixmap = (Pixmap )prop;
		1647	XFree (prop);
1545	}	1648	}
1546		1649
1547	return None;	1650	return pixmap;
1548	}	1651	}
1549		1652
1550	#ifdef HAVE_BG_PIXMAP	1653	#ifdef HAVE_BG_PIXMAP
1551	# if TRACE_PIXMAPS
1552	# undef update_background
1553	void
1554	rxvt_term::trace_update_background (const char *file, int line)
1555	{
1556	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1557	update_background ();
1558	}
1559	# endif
1560		1654
1561	void	1655	void
1562	rxvt_term::update_background ()	1656	rxvt_term::update_background ()
1563	{	1657	{
1564	if (update_background_ev.is_active ())	1658	if (update_background_ev.is_active ())
1565	return;	1659	return;
1566		1660
1567	bgPixmap.invalidate ();	1661	bg_invalidate ();
1568		1662
1569	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1663	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1570		1664
1571	if (to_wait <= 0.)	1665	if (to_wait <= 0.)
1572	bgPixmap.render ();	1666	bg_render ();
1573	else	1667	else
1574	update_background_ev.start (to_wait);	1668	update_background_ev.start (to_wait);
1575	}	1669	}
1576		1670
1577	void	1671	void
1578	rxvt_term::update_background_cb (ev::timer &w, int revents)	1672	rxvt_term::update_background_cb (ev::timer &w, int revents)
1579	{	1673	{
1580	make_current ();	1674	make_current ();
1581		1675
1582	update_background_ev.stop ();	1676	update_background_ev.stop ();
1583	bgPixmap.render ();	1677	bg_render ();
1584	refresh_check ();	1678	refresh_check ();
1585	}	1679	}
1586		1680
1587	#endif /* HAVE_BG_PIXMAP */	1681	#endif /* HAVE_BG_PIXMAP */
1588		1682

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.308 by ayin, Tue Feb 19 13:01:32 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.308 by ayin, Tue Feb 19 13:01:32 2008 UTC vs.
Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC