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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs.
Revision 1.368 by root, Wed Jan 18 12:26:59 2012 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94	{	97	{
95	compose_char *cc;	98	compose_char *cc;
96		99
97	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	102	cc = (*this)[c1];
100	while (cc)	103	while (cc)
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.begin (); cc < v.end (); cc++)
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	#ifdef XTERM_SCROLLBAR	241	scrollBar.destroy ();
241	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242	if (ShadowGC) XFreeGC (dpy, ShadowGC);
243	#endif
244	#ifdef PLAIN_SCROLLBAR
245	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246	#endif
247	#ifdef NEXT_SCROLLBAR
248	if (blackGC) XFreeGC (dpy, blackGC);
249	if (whiteGC) XFreeGC (dpy, whiteGC);
250	if (grayGC) XFreeGC (dpy, grayGC);
251	if (darkGC) XFreeGC (dpy, darkGC);
252	if (stippleGC) XFreeGC (dpy, stippleGC);
253	if (dimple) XFreePixmap (dpy, dimple);
254	if (upArrow) XFreePixmap (dpy, upArrow);
255	if (downArrow) XFreePixmap (dpy, downArrow);
256	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258	#endif
259	#ifdef RXVT_SCROLLBAR
260	if (topShadowGC) XFreeGC (dpy, topShadowGC);
261	if (botShadowGC) XFreeGC (dpy, botShadowGC);
262	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263	#endif
264	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
265		243
266	delete drawable;	244	delete drawable;
267	// destroy all windows	245	// destroy all windows
268	if (parent[0])	246	if (parent)
269	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
270		248
271	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
272	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
273	{	251	{
274	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
288	/* clear all resources */	266	/* clear all resources */
289	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
290	free (allocated [i]);	268	free (allocated [i]);
291		269
292	free (selection.text);	270	free (selection.text);
293	// TODO: manage env vars in child only(!)	271	free (selection.clip_text);
294	free (env_display);
295	free (env_term);
296	free (locale);	272	free (locale);
297	free (v_buffer);	273	free (v_buffer);
298	free (incr_buf);	274
		275	delete selection_req;
299		276
300	delete envv;	277	delete envv;
301	delete argv;	278	delete argv;
302		279
303	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
…		…
339	#endif	316	#endif
340	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
342	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
343	#endif	320	#endif
344	incr_ev.stop ();
345	termwin_ev.stop (display);	321	termwin_ev.stop (display);
346	vt_ev.stop (display);	322	vt_ev.stop (display);
347	}	323	}
348		324
349	flush_ev.stop ();	325	flush_ev.stop ();
…		…
371	rxvt_term::destroy_cb (ev::idle &w, int revents)	347	rxvt_term::destroy_cb (ev::idle &w, int revents)
372	{	348	{
373	make_current ();	349	make_current ();
374		350
375	delete this;	351	delete this;
		352	}
		353
		354	void
		355	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
		356	{
		357	if (!opt)
		358	return;
		359
		360	uint8_t mask = 1 << (opt & 7);
		361	uint8_t &val = options [opt >> 3];
		362
		363	val = val & ~mask \| (set ? mask : 0);
376	}	364	}
377		365
378	/----------------------------------------------------------------------/	366	/----------------------------------------------------------------------/
379	/*	367	/*
380	* Exit gracefully, clearing the utmp entry and restoring tty attributes	368	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
394	print_x_error (Display dpy, XErrorEvent event)	382	print_x_error (Display dpy, XErrorEvent event)
395	{	383	{
396	char buffer[BUFSIZ];	384	char buffer[BUFSIZ];
397	char mesg[BUFSIZ];	385	char mesg[BUFSIZ];
398	char number[32];	386	char number[32];
399	char *mtype = "XlibMessage";	387	const char mtype[] = "XlibMessage";
400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	388	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	389	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402	rxvt_warn ("An X Error occured, trying to continue after report.\n");	390	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403	rxvt_warn ("%s: %s\n", mesg, buffer);	391	rxvt_warn ("%s: %s\n", mesg, buffer);
404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	393	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406	sprintf(number, "%d", event->request_code);	394	sprintf(number, "%d", event->request_code);
407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408	rxvt_warn ("(which is %s)\n", buffer);	396	rxvt_warn ("(which is %s)\n", buffer);
409	if (event->request_code >= 128) {	397	if (event->request_code >= 128) {
410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	398	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411	mesg, BUFSIZ);	399	mesg, BUFSIZ);
412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413	}	401	}
414	if ((event->error_code == BadWindow) \|\|	402	if ((event->error_code == BadWindow) \|\|
415	(event->error_code == BadPixmap) \|\|	403	(event->error_code == BadPixmap) \|\|
416	(event->error_code == BadCursor) \|\|	404	(event->error_code == BadCursor) \|\|
417	(event->error_code == BadFont) \|\|	405	(event->error_code == BadFont) \|\|
418	(event->error_code == BadDrawable) \|\|	406	(event->error_code == BadDrawable) \|\|
419	(event->error_code == BadColor) \|\|	407	(event->error_code == BadColor) \|\|
420	(event->error_code == BadGC) \|\|	408	(event->error_code == BadGC) \|\|
421	(event->error_code == BadIDChoice) \|\|	409	(event->error_code == BadIDChoice) \|\|
422	(event->error_code == BadValue) \|\|	410	(event->error_code == BadValue) \|\|
423	(event->error_code == BadAtom)) {	411	(event->error_code == BadAtom)) {
424	if (event->error_code == BadValue)	412	if (event->error_code == BadValue)
425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426	mesg, BUFSIZ);	414	mesg, BUFSIZ);
427	else if (event->error_code == BadAtom)	415	else if (event->error_code == BadAtom)
428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429	mesg, BUFSIZ);	417	mesg, BUFSIZ);
430	else	418	else
431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432	mesg, BUFSIZ);	420	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	421	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434	}	422	}
435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	423	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436	mesg, BUFSIZ);	424	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438	}	426	}
439	#endif	427	#endif
440		428
441	int	429	int
…		…
488	rxvt_emergency_cleanup ();	476	rxvt_emergency_cleanup ();
489	w.stop ();	477	w.stop ();
490	kill (getpid (), w.signum);	478	kill (getpid (), w.signum);
491	}	479	}
492		480
		481	static void
		482	rxvt_get_ttymode (struct termios *tio)
		483	{
		484	if (tcgetattr (STDIN_FILENO, tio) < 0)
		485	memset (tio, 0, sizeof (struct termios));
		486
		487	for (int i = 0; i < NCCS; i++)
		488	tio->c_cc[i] = VDISABLE;
		489
		490	tio->c_cc[VINTR] = CINTR;
		491	tio->c_cc[VQUIT] = CQUIT;
		492	tio->c_cc[VERASE] = CERASE;
		493	#ifdef VERASE2
		494	tio->c_cc[VERASE2] = CERASE2;
		495	#endif
		496	tio->c_cc[VKILL] = CKILL;
		497	tio->c_cc[VEOF] = CEOF;
		498	tio->c_cc[VSTART] = CSTART;
		499	tio->c_cc[VSTOP] = CSTOP;
		500	tio->c_cc[VSUSP] = CSUSP;
		501	# ifdef VDSUSP
		502	tio->c_cc[VDSUSP] = CDSUSP;
		503	# endif
		504	# ifdef VREPRINT
		505	tio->c_cc[VREPRINT] = CRPRNT;
		506	# endif
		507	# ifdef VDISCRD
		508	tio->c_cc[VDISCRD] = CFLUSH;
		509	# endif
		510	# ifdef VWERSE
		511	tio->c_cc[VWERSE] = CWERASE;
		512	# endif
		513	# ifdef VLNEXT
		514	tio->c_cc[VLNEXT] = CLNEXT;
		515	# endif
		516	# ifdef VSTATUS
		517	tio->c_cc[VSTATUS] = CSTATUS;
		518	# endif
		519
		520	# if VMIN != VEOF
		521	tio->c_cc[VMIN] = 1;
		522	# endif
		523	# if VTIME != VEOL
		524	tio->c_cc[VTIME] = 0;
		525	# endif
		526
		527	/* input modes */
		528	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		529	# ifdef IMAXBEL
		530	\| IMAXBEL
		531	# endif
		532	\| IXON);
		533
		534	/* output modes */
		535	tio->c_oflag = (OPOST \| ONLCR);
		536
		537	/* control modes */
		538	tio->c_cflag = (CS8 \| CREAD);
		539
		540	/* local modes */
		541	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		542	# if defined (ECHOCTL) && defined (ECHOKE)
		543	\| ECHOCTL \| ECHOKE
		544	# endif
		545	\| ECHOE \| ECHOK);
		546	}
		547
493	char **rxvt_environ; // startup environment	548	char **rxvt_environ; // startup environment
494		549
495	void	550	void
496	rxvt_init ()	551	rxvt_init ()
497	{	552	{
498	ptytty::init ();	553	assert (("fontMask must not overlap other RS masks",
		554	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
499		555
		556	rxvt_get_ttymode (&rxvt_term::def_tio);
		557
		558	// get rid of stdin/stdout as we don't need them, to free resources
		559	dup2 (STDERR_FILENO, STDIN_FILENO);
		560	dup2 (STDERR_FILENO, STDOUT_FILENO);
		561
500	if (!ev_default_loop (0))	562	if (!ev_default_loop ())
501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	563	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502		564
503	rxvt_environ = environ;	565	rxvt_environ = environ;
504		566
505	signal (SIGHUP, SIG_IGN);	567	signal (SIGHUP, SIG_IGN);
506	signal (SIGPIPE, SIG_IGN);	568	signal (SIGPIPE, SIG_IGN);
507		569
508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	570	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509	sig_handlers.sw_int.start (SIGINT); ev_unref ();	571	sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
512	/* signal (SIGURG, SIG_DFL); */
513		572
514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	573	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515	// TODO: handle this with exceptions and tolerate the memory loss	574	// TODO: handle this with exceptions and tolerate the memory loss
516	XSetIOErrorHandler (rxvt_xioerror_handler);	575	XSetIOErrorHandler (rxvt_xioerror_handler);
517		576
…		…
525	*/	584	*/
526	void	585	void
527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	586	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528	{	587	{
529	short recalc_x, recalc_y;	588	short recalc_x, recalc_y;
530	int x, y, sb_w, flags;	589	int x, y, flags;
531	unsigned int w, h;	590	unsigned int w, h;
532	unsigned int max_width, max_height;	591	unsigned int max_width, max_height;
533		592
534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	593	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
535	szHint.win_gravity = NorthWestGravity;	594	szHint.win_gravity = NorthWestGravity;
…		…
545	if (rs[Rs_geometry])	604	if (rs[Rs_geometry])
546	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	605	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547		606
548	if (flags & WidthValue)	607	if (flags & WidthValue)
549	{	608	{
		609	if (!w)
		610	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		611
550	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	612	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551	szHint.flags \|= USSize;	613	szHint.flags \|= USSize;
552	}	614	}
553		615
554	if (flags & HeightValue)	616	if (flags & HeightValue)
555	{	617	{
		618	if (!h)
		619	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		620
556	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	621	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557	szHint.flags \|= USSize;	622	szHint.flags \|= USSize;
558	}	623	}
559		624
560	if (flags & XValue)	625	if (flags & XValue)
561	{	626	{
…		…
592	max_width = MAX_COLS * fwidth;	657	max_width = MAX_COLS * fwidth;
593	max_height = MAX_ROWS * fheight;	658	max_height = MAX_ROWS * fheight;
594		659
595	szHint.base_width = szHint.base_height = 2 * int_bwidth;	660	szHint.base_width = szHint.base_height = 2 * int_bwidth;
596		661
597	sb_w = 0;
598	window_vt_x = window_vt_y = int_bwidth;	662	window_vt_x = window_vt_y = int_bwidth;
599		663
600	if (scrollBar.state)	664	if (scrollBar.state)
601	{	665	{
602	sb_w = scrollBar.total_width ();	666	int sb_w = scrollBar.total_width ();
603	szHint.base_width += sb_w;	667	szHint.base_width += sb_w;
604		668
605	if (!option (Opt_scrollBar_right))	669	if (!option (Opt_scrollBar_right))
606	window_vt_x += sb_w;	670	window_vt_x += sb_w;
607	}	671	}
…		…
631	{	695	{
632	min_it (height, max_height);	696	min_it (height, max_height);
633	szHint.height = szHint.base_height + height;	697	szHint.height = szHint.base_height + height;
634	}	698	}
635		699
636	if (scrollBar.state && option (Opt_scrollBar_right))
637	window_sb_x = szHint.width - sb_w;
638
639	if (recalc_x)	700	if (recalc_x)
640	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	701	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641		702
642	if (recalc_y)	703	if (recalc_y)
643	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	704	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644		705
645	ncol = width / fwidth;	706	ncol = width / fwidth;
646	nrow = height / fheight;	707	nrow = height / fheight;
		708
		709	// When the size of the vt window is not a multiple of the cell
		710	// size, i.e., when the wm does not honour our size hints, there are
		711	// extra areas not covered by the terminal screen. Such gaps, when a
		712	// bg pixmap is set, would have to be cleared manually to properly
		713	// refresh the background. We take the simpler route and shrink the
		714	// vt window so as to avoid creating gaps.
		715	vt_width = ncol * fwidth;
		716	vt_height = nrow * fheight;
647	}	717	}
648		718
649	/----------------------------------------------------------------------/	719	/----------------------------------------------------------------------/
650	/*	720	/*
651	* Tell the teletype handler what size the window is.	721	* Tell the teletype handler what size the window is.
…		…
659		729
660	struct winsize ws;	730	struct winsize ws;
661		731
662	ws.ws_col = ncol;	732	ws.ws_col = ncol;
663	ws.ws_row = nrow;	733	ws.ws_row = nrow;
664	ws.ws_xpixel = width;	734	ws.ws_xpixel = vt_width;
665	ws.ws_ypixel = height;	735	ws.ws_ypixel = vt_height;
666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	736	ioctl (pty->pty, TIOCSWINSZ, &ws);
667		737
668	#if 0	738	#if 0
669	// TIOCSWINSZ is supposed to do this automatically and correctly	739	// TIOCSWINSZ is supposed to do this automatically and correctly
670	if (cmd_pid) /* force through to the command */	740	if (cmd_pid) /* force through to the command */
671	kill (-cmd_pid, SIGWINCH);	741	kill (-cmd_pid, SIGWINCH);
672	#endif	742	#endif
673	}	743	}
674		744
675	/----------------------------------------------------------------------/	745	/----------------------------------------------------------------------/
676	/* set_fonts () - load and set the various fonts	746	/* load and set the various fonts */
677	*
678	* init = 1 - initialize
679	*
680	* fontname == FONT_UP - switch to bigger font
681	* fontname == FONT_DN - switch to smaller font
682	*/
683	bool	747	bool
684	rxvt_term::set_fonts ()	748	rxvt_term::set_fonts ()
685	{	749	{
686	rxvt_fontset *fs = new rxvt_fontset (this);	750	rxvt_fontset *fs = new rxvt_fontset (this);
687	rxvt_fontprop prop;	751	rxvt_fontprop prop;
…		…
701	#endif	765	#endif
702		766
703	delete fontset[0];	767	delete fontset[0];
704	fontset[0] = fs;	768	fontset[0] = fs;
705		769
706	prop = (*fs)[1]->properties ();	770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707	prop.height += lineSpace;	771	prop.height += lineSpace;
		772	prop.width += letterSpace;
708		773
709	fs->set_prop (prop, false);	774	fs->set_prop (prop, false);
710		775
711	fwidth = prop.width;	776	fwidth = prop.width;
712	fheight = prop.height;	777	fheight = prop.height;
…		…
743	#else	808	#else
744	fontset[style] = fontset[0];	809	fontset[style] = fontset[0];
745	#endif	810	#endif
746	}	811	}
747		812
748	if (parent[0])	813	if (parent)
749	{	814	{
750	resize_all_windows (0, 0, 0);	815	resize_all_windows (0, 0, 0);
751	scr_remap_chars ();	816	scr_remap_chars ();
752	scr_touch (true);	817	scr_touch (true);
753	}	818	}
…		…
756	}	821	}
757		822
758	void	823	void
759	rxvt_term::set_string_property (Atom prop, const char *str, int len)	824	rxvt_term::set_string_property (Atom prop, const char *str, int len)
760	{	825	{
761	XChangeProperty (dpy, parent[0],	826	XChangeProperty (dpy, parent,
762	prop, XA_STRING, 8, PropModeReplace,	827	prop, XA_STRING, 8, PropModeReplace,
763	(const unsigned char *)str, len >= 0 ? len : strlen (str));	828	(const unsigned char *)str, len >= 0 ? len : strlen (str));
764	}	829	}
765		830
766	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, &ct, prop);
		839	XFree (ct.value);
		840	}
		841	}
		842
		843	void
767	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)
768	{	845	{
769	wchar_t *ws = rxvt_mbstowcs (str, len);	846	wchar_t *ws = rxvt_mbstowcs (str, len);
770	char *s = rxvt_wcstoutf8 (ws);	847	char *s = rxvt_wcstoutf8 (ws);
771		848
772	XChangeProperty (dpy, parent[0],	849	XChangeProperty (dpy, parent,
773	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	850	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
774	(const unsigned char *)s, strlen (s));	851	(const unsigned char *)s, strlen (s));
775		852
776	free (s);	853	free (s);
777	free (ws);	854	free (ws);
…		…
781	/----------------------------------------------------------------------/	858	/----------------------------------------------------------------------/
782	/* xterm sequences - title, iconName, color (exptl) */	859	/* xterm sequences - title, iconName, color (exptl) */
783	void	860	void
784	rxvt_term::set_title (const char *str)	861	rxvt_term::set_title (const char *str)
785	{	862	{
786	set_string_property (XA_WM_NAME, str);	863	set_mbstring_property (XA_WM_NAME, str);
787	#if ENABLE_EWMH	864	#if ENABLE_EWMH
788	set_utf8_property (xa[XA_NET_WM_NAME], str);	865	set_utf8_property (xa[XA_NET_WM_NAME], str);
789	#endif	866	#endif
790	}	867	}
791		868
792	void	869	void
793	rxvt_term::set_icon_name (const char *str)	870	rxvt_term::set_icon_name (const char *str)
794	{	871	{
795	set_string_property (XA_WM_ICON_NAME, str);	872	set_mbstring_property (XA_WM_ICON_NAME, str);
796	#if ENABLE_EWMH	873	#if ENABLE_EWMH
797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	874	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798	#endif	875	#endif
799	}	876	}
800		877
…		…
867		944
868	/----------------------------------------------------------------------/	945	/----------------------------------------------------------------------/
869	/*	946	/*
870	* find if fg/bg matches any of the normal (low-intensity) colors	947	* find if fg/bg matches any of the normal (low-intensity) colors
871	*/	948	*/
872	void	949	char *
873	rxvt_term::set_colorfgbg ()	950	rxvt_term::get_colorfgbg ()
874	{	951	{
875	unsigned int i;	952	unsigned int i;
876	const char *xpmb = "";	953	const char *xpmb = "";
877	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	954	char fstr[] = "default";
		955	char bstr[] = "default";
		956	char *env_colorfgbg;
878		957
879	strcpy (fstr, "default");
880	strcpy (bstr, "default");
881	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
882	if (pix_colors[Color_fg] == pix_colors[i])	959	if (pix_colors[Color_fg] == pix_colors[i])
883	{	960	{
884	sprintf (fstr, "%d", (i - Color_Black));	961	sprintf (fstr, "%d", i - Color_Black);
885	break;	962	break;
886	}	963	}
887		964
888	for (i = Color_Black; i <= Color_White; i++)	965	for (i = Color_Black; i <= Color_White; i++)
889	if (pix_colors[Color_bg] == pix_colors[i])	966	if (pix_colors[Color_bg] == pix_colors[i])
890	{	967	{
891	sprintf (bstr, "%d", (i - Color_Black));	968	sprintf (bstr, "%d", i - Color_Black);
892	#ifdef BG_IMAGE_FROM_FILE	969	#ifdef BG_IMAGE_FROM_FILE
893	xpmb = "default;";	970	xpmb = "default;";
894	#endif	971	#endif
895	break;	972	break;
896	}	973	}
897		974
		975	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
898	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	976	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		977	return env_colorfgbg;
899	}	978	}
900		979
901	/----------------------------------------------------------------------/	980	/----------------------------------------------------------------------/
902		981
903	bool	982	bool
…		…
926	int old_width = szHint.width;	1005	int old_width = szHint.width;
927	int old_height = szHint.height;	1006	int old_height = szHint.height;
928		1007
929	window_calc (newwidth, newheight);	1008	window_calc (newwidth, newheight);
930		1009
931	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1010	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1011
		1012	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1013	if (set_hint)
		1014	{
		1015	szHint.flags &= ~(PBaseSize \| PResizeInc);
932	XSetWMNormalHints (dpy, parent[0], &szHint);	1016	XSetWMNormalHints (dpy, parent, &szHint);
		1017	szHint.flags \|= PBaseSize \| PResizeInc;
		1018	}
933		1019
934	if (!ignoreparent)	1020	if (!ignoreparent)
935	{	1021	{
936	#ifdef SMART_RESIZE	1022	#ifdef SMART_RESIZE
937	/*	1023	/*
…		…
941	int x, y, x1, y1;	1027	int x, y, x1, y1;
942	int dx, dy;	1028	int dx, dy;
943	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1029	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
944	Window unused_cr;	1030	Window unused_cr;
945		1031
946	XTranslateCoordinates (dpy, parent[0], display->root,	1032	XTranslateCoordinates (dpy, parent, display->root,
947	0, 0, &x, &y, &unused_cr);	1033	0, 0, &x, &y, &unused_cr);
948	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1034	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
949	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1035	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
950	/*	1036	/*
951	* if display->root isn't the parent window, a WM will probably have offset	1037	* if display->root isn't the parent window, a WM will probably have offset
952	* our position for handles and decorations. Counter it	1038	* our position for handles and decorations. Counter it
953	*/	1039	*/
…		…
970	if (y < y1) /* top half */	1056	if (y < y1) /* top half */
971	dy = 0;	1057	dy = 0;
972	else if (y == y1) /* exact center */	1058	else if (y == y1) /* exact center */
973	dy /= 2;	1059	dy /= 2;
974		1060
975	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1061	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
976	szHint.width, szHint.height);	1062	szHint.width, szHint.height);
977	#else	1063	#else
978	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1064	XResizeWindow (dpy, parent, szHint.width, szHint.height);
979	#endif	1065	#endif
980	}	1066	}
		1067
		1068	if (set_hint)
		1069	XSetWMNormalHints (dpy, parent, &szHint);
981		1070
982	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1071	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
983		1072
984	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1073	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
985	{	1074	{
986	if (scrollBar.state)	1075	if (scrollBar.state)
987	{	1076	scrollBar.resize ();
988	XMoveResizeWindow (dpy, scrollBar.win,
989	window_sb_x, 0,
990	scrollBar.total_width (), szHint.height);
991	resize_scrollbar ();
992	}
993		1077
994	XMoveResizeWindow (dpy, vt,	1078	XMoveResizeWindow (dpy, vt,
995	window_vt_x, window_vt_y,	1079	window_vt_x, window_vt_y,
996	width, height);	1080	vt_width, vt_height);
997		1081
998	#ifdef HAVE_BG_PIXMAP	1082	#ifdef HAVE_BG_PIXMAP
999	if (bgPixmap.window_size_sensitive ())	1083	if (bg_window_size_sensitive ())
1000	update_background ();	1084	update_background ();
1001	#endif	1085	#endif
1002
1003	scr_clear ();
1004	}	1086	}
1005		1087
1006	if (fix_screen \|\| old_height == 0)	1088	if (fix_screen \|\| old_height == 0)
1007	scr_reset ();	1089	scr_reset ();
1008		1090
1009	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1010	//scr_touch (false);
1011
1012	#ifdef HAVE_BG_PIXMAP
1013	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1014	// if (bgPixmap.pixmap)
1015	// scr_touch (false);
1016	#endif
1017
1018	#ifdef USE_XIM	1091	#ifdef USE_XIM
1019	IMSetPosition ();	1092	im_set_position ();
1020	#endif	1093	#endif
1021	}	1094	}
1022		1095
1023	/*	1096	/*
1024	* Set the width/height of the vt window in characters. Units are pixels.	1097	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1037	newwidth = wattr.width - szHint.base_width;	1110	newwidth = wattr.width - szHint.base_width;
1038	if (newheight == 0)	1111	if (newheight == 0)
1039	newheight = wattr.height - szHint.base_height;	1112	newheight = wattr.height - szHint.base_height;
1040	}	1113	}
1041		1114
1042	if (newwidth != width \|\| newheight != height)	1115	if (newwidth != vt_width \|\| newheight != vt_height)
1043	{	1116	{
1044	newwidth += szHint.base_width;	1117	newwidth += szHint.base_width;
1045	newheight += szHint.base_height;	1118	newheight += szHint.base_height;
1046	resize_all_windows (newwidth, newheight, 0);	1119	resize_all_windows (newwidth, newheight, 0);
1047	}	1120	}
…		…
1085	status_rect.height = fheight;	1158	status_rect.height = fheight;
1086	}	1159	}
1087		1160
1088	/* Checking whether input method is running. */	1161	/* Checking whether input method is running. */
1089	bool	1162	bool
1090	rxvt_term::IMisRunning ()	1163	rxvt_term::im_is_running ()
1091	{	1164	{
1092	char *p;
1093	Atom atom;	1165	Atom atom;
1094	Window win;	1166	Window win;
1095	char server[IMBUFSIZ];	1167	char server[IMBUFSIZ];
1096		1168
1097	/* get current locale modifier */	1169	/* get current locale modifier */
1098	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1170	if (char *p = XSetLocaleModifiers (0))
1099	{	1171	{
1100	strcpy (server, "@server=");	1172	strcpy (server, "@server=");
1101	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1173	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1102		1174
1103	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1175	if (p = strchr (server + 1, '@')) /* first one only */
1104	*p = '\0';	1176	*p = '\0';
1105		1177
1106	atom = XInternAtom (dpy, server, False);	1178	atom = XInternAtom (dpy, server, False);
1107	win = XGetSelectionOwner (dpy, atom);	1179	win = XGetSelectionOwner (dpy, atom);
1108		1180
1109	if (win != None)	1181	if (win != None)
1110	return True;	1182	return true;
1111	}	1183	}
1112		1184
1113	return False;	1185	return false;
1114	}	1186	}
1115		1187
1116	void	1188	void
1117	rxvt_term::IMSendSpot ()	1189	rxvt_term::im_send_spot ()
1118	{	1190	{
1119	XPoint nspot;	1191	XPoint nspot;
1120	XVaNestedList preedit_attr;	1192	XVaNestedList preedit_attr;
1121		1193
1122	if (!Input_Context	1194	if (!Input_Context
…		…
1175		1247
1176	term->make_current ();	1248	term->make_current ();
1177		1249
1178	if (text)	1250	if (text)
1179	{	1251	{
1180	void *str;	1252	wchar_t *str;
1181		1253
1182	if (!text->encoding_is_wchar && text->string.multi_byte)	1254	if (!text->encoding_is_wchar && text->string.multi_byte)
1183	{	1255	{
1184	// of course, X makes it ugly again	1256	// of course, X makes it ugly again
1185	if (term->rs[Rs_imLocale])	1257	if (term->rs[Rs_imLocale])
1186	SET_LOCALE (term->rs[Rs_imLocale]);	1258	SET_LOCALE (term->rs[Rs_imLocale]);
1187		1259
1188	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1260	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1189	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1261	mbstowcs (str, text->string.multi_byte, text->length + 1);
1190		1262
1191	if (term->rs[Rs_imLocale])	1263	if (term->rs[Rs_imLocale])
1192	SET_LOCALE (term->locale);	1264	SET_LOCALE (term->locale);
1193	}	1265	}
1194	else	1266	else
1195	str = (void *)text->string.wide_char;	1267	str = text->string.wide_char;
1196		1268
1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1269	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198	DT_INT, call_data->caret,	1270	DT_INT, call_data->caret,
1199	DT_INT, call_data->chg_first,	1271	DT_INT, call_data->chg_first,
1200	DT_INT, call_data->chg_length,	1272	DT_INT, call_data->chg_length,
…		…
1228	/*	1300	/*
1229	* Try to open a XIM with the current modifiers, then see if we can	1301	* Try to open a XIM with the current modifiers, then see if we can
1230	* open a suitable preedit type	1302	* open a suitable preedit type
1231	*/	1303	*/
1232	bool	1304	bool
1233	rxvt_term::IM_get_IC (const char *modifiers)	1305	rxvt_term::im_get_ic (const char *modifiers)
1234	{	1306	{
1235	int i, j, found;	1307	int i, j, found;
1236	XIM xim;	1308	XIM xim;
1237	XPoint spot;	1309	XPoint spot;
1238	XRectangle rect, status_rect, needed_rect;	1310	XRectangle rect, status_rect, needed_rect;
1239	unsigned long fg, bg;	1311	unsigned long fg, bg;
1240	const char *p;	1312	const char *p;
1241	char **s;	1313	char **s;
1242	XIMStyles *xim_styles;	1314	XIMStyles *xim_styles;
1243	#ifdef ENABLE_XIM_ONTHESPOT
1244	XIMCallback xcb[4];
1245	#endif
1246		1315
1247	set_environ (envv);	1316	set_environ (envv);
1248		1317
1249	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1318	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1250	return false;	1319	return false;
…		…
1271	p = pet[pi];	1340	p = pet[pi];
1272		1341
1273	if (!p)	1342	if (!p)
1274	continue;	1343	continue;
1275		1344
1276	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1277		1346
1278	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1279	{	1348	{
1280	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1281	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1293	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1294		1363
1295	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1296	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1297	{	1366	{
1298	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1299		1368
1300	found = 1;	1369	found = 1;
1301	goto foundpet;	1370	goto foundpet;
1302	}	1371	}
1303		1372
1304	}	1373	}
1305		1374
1306	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1307	}	1376	}
1308		1377
1309	foundpet:	1378	foundpet:
1310		1379
1311	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1390	NULL);	1459	NULL);
1391	}	1460	}
1392	#if ENABLE_XIM_ONTHESPOT	1461	#if ENABLE_XIM_ONTHESPOT
1393	else if (input_style & XIMPreeditCallbacks)	1462	else if (input_style & XIMPreeditCallbacks)
1394	{	1463	{
		1464	XIMCallback xcb[4];
		1465
1395	im_set_position (spot);	1466	im_set_position (spot);
1396		1467
1397	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1468	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1398	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1469	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1399	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1470	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1414	#endif	1485	#endif
1415		1486
1416	Input_Context = XCreateIC (xim,	1487	Input_Context = XCreateIC (xim,
1417	XNInputStyle, input_style,	1488	XNInputStyle, input_style,
1418	XNClientWindow, vt,	1489	XNClientWindow, vt,
1419	XNFocusWindow, parent[0],	1490	XNFocusWindow, parent,
1420	preedit_attr ? XNPreeditAttributes : NULL,	1491	preedit_attr ? XNPreeditAttributes : NULL,
1421	preedit_attr,	1492	preedit_attr,
1422	status_attr ? XNStatusAttributes : NULL,	1493	status_attr ? XNStatusAttributes : NULL,
1423	status_attr, NULL);	1494	status_attr, NULL);
1424		1495
…		…
1437	// unfortunately, only the focus window is used by XIM, hard to fix	1508	// unfortunately, only the focus window is used by XIM, hard to fix
1438	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1509	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1439	vt_select_input ();	1510	vt_select_input ();
1440	#endif	1511	#endif
1441		1512
1442	IMSetPosition ();	1513	im_set_position ();
1443		1514
1444	return true;	1515	return true;
1445	}	1516	}
1446		1517
1447	void	1518	void
…		…
1467	p = rs[Rs_inputMethod];	1538	p = rs[Rs_inputMethod];
1468	if (p && *p)	1539	if (p && *p)
1469	{	1540	{
1470	bool found = false;	1541	bool found = false;
1471		1542
1472	s = rxvt_splitcommastring (p);	1543	s = rxvt_strsplit (',', p);
1473		1544
1474	for (i = 0; s[i]; i++)	1545	for (i = 0; s[i]; i++)
1475	{	1546	{
1476	if (*s[i])	1547	if (*s[i])
1477	{	1548	{
1478	strcpy (buf, "@im=");	1549	strcpy (buf, "@im=");
1479	strncat (buf, s[i], IMBUFSIZ - 5);	1550	strncat (buf, s[i], IMBUFSIZ - 5);
1480	if (IM_get_IC (buf))	1551	if (im_get_ic (buf))
1481	{	1552	{
1482	found = true;	1553	found = true;
1483	break;	1554	break;
1484	}	1555	}
1485	}	1556	}
1486	}	1557	}
1487		1558
1488	rxvt_freecommastring (s);	1559	rxvt_free_strsplit (s);
1489		1560
1490	if (found)	1561	if (found)
1491	goto done;	1562	goto done;
1492	}	1563	}
1493		1564
1494	/* try with XMODIFIERS env. var. */	1565	/* try with XMODIFIERS env. var. */
1495	if (IM_get_IC (""))	1566	if (im_get_ic (""))
1496	goto done;	1567	goto done;
1497		1568
1498	/* try with no modifiers base IF the user didn't specify an IM */	1569	/* try with no modifiers base IF the user didn't specify an IM */
1499	if (IM_get_IC ("@im=none"))	1570	if (im_get_ic ("@im=none"))
1500	goto done;	1571	goto done;
1501		1572
1502	done:	1573	done: ;
1503	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1504	if (rs[Rs_imLocale])	1575	if (rs[Rs_imLocale])
1505	SET_LOCALE (locale);	1576	SET_LOCALE (locale);
1506	#endif	1577	#endif
1507	}	1578	}
1508		1579
1509	void	1580	void
1510	rxvt_term::IMSetPosition ()	1581	rxvt_term::im_set_position ()
1511	{	1582	{
1512	XRectangle preedit_rect, status_rect, *needed_rect;	1583	XRectangle preedit_rect, status_rect, *needed_rect;
1513	XVaNestedList preedit_attr, status_attr;	1584	XVaNestedList preedit_attr, status_attr;
1514		1585
1515	if (!Input_Context	1586	if (!Input_Context
1516	\|\| !focus	1587	\|\| !focus
1517	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1588	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1518	\|\| !IMisRunning ())	1589	\|\| !im_is_running ())
1519	return;	1590	return;
1520		1591
1521	if (input_style & XIMPreeditPosition)	1592	if (input_style & XIMPreeditPosition)
1522	{	1593	{
1523	im_set_size (preedit_rect);	1594	im_set_size (preedit_rect);
…		…
1553		1624
1554	void	1625	void
1555	rxvt_term::get_window_origin (int &x, int &y)	1626	rxvt_term::get_window_origin (int &x, int &y)
1556	{	1627	{
1557	Window cr;	1628	Window cr;
1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560	}	1630	}
1561		1631
1562	Pixmap	1632	Pixmap
1563	rxvt_term::get_pixmap_property (int prop_id)	1633	rxvt_term::get_pixmap_property (Atom property)
1564	{	1634	{
1565	if (prop_id > 0 && prop_id < NUM_XA)	1635	Pixmap pixmap = None;
1566	if (xa[prop_id])	1636
1567	{
1568	int aformat;	1637	int aformat;
1569	unsigned long nitems, bytes_after;	1638	unsigned long nitems, bytes_after;
1570	Atom atype;	1639	Atom atype;
1571	unsigned char *prop = NULL;	1640	unsigned char *prop;
1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1641	int result = XGetWindowProperty (dpy, display->root, property,
1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1642	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574	&nitems, &bytes_after, &prop);	1643	&nitems, &bytes_after, &prop);
1575	if (result == Success && prop && atype == XA_PIXMAP)	1644	if (result == Success)
		1645	{
		1646	if (atype == XA_PIXMAP)
1576	return (Pixmap )prop;	1647	pixmap = (Pixmap )prop;
		1648	XFree (prop);
1577	}	1649	}
1578		1650
1579	return None;	1651	return pixmap;
1580	}	1652	}
1581		1653
1582	#ifdef HAVE_BG_PIXMAP	1654	#ifdef HAVE_BG_PIXMAP
1583	# if TRACE_PIXMAPS
1584	# undef update_background
1585	void
1586	rxvt_term::trace_update_background (const char *file, int line)
1587	{
1588	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589	update_background ();
1590	}
1591	# endif
1592		1655
1593	void	1656	void
1594	rxvt_term::update_background ()	1657	rxvt_term::update_background ()
1595	{	1658	{
1596	if (update_background_ev.is_active ())	1659	if (update_background_ev.is_active ())
1597	return;	1660	return;
1598		1661
1599	bgPixmap.invalidate ();	1662	bg_invalidate ();
1600		1663
		1664	if (!mapped)
		1665	return;
		1666
1601	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1667	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602		1668
1603	if (to_wait <= 0.)	1669	if (to_wait <= 0.)
1604	bgPixmap.render ();	1670	bg_render ();
1605	else	1671	else
1606	update_background_ev.start (to_wait);	1672	update_background_ev.start (to_wait);
1607	}	1673	}
1608		1674
1609	void	1675	void
1610	rxvt_term::update_background_cb (ev::timer &w, int revents)	1676	rxvt_term::update_background_cb (ev::timer &w, int revents)
1611	{	1677	{
1612	make_current ();	1678	make_current ();
1613		1679
1614	update_background_ev.stop ();	1680	update_background_ev.stop ();
1615	bgPixmap.render ();	1681	bg_render ();
1616	refresh_check ();	1682	refresh_check ();
1617	}	1683	}
1618		1684
1619	#endif /* HAVE_BG_PIXMAP */	1685	#endif /* HAVE_BG_PIXMAP */
1620		1686

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs. Revision 1.368 by root, Wed Jan 18 12:26:59 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs.
Revision 1.368 by root, Wed Jan 18 12:26:59 2012 UTC