[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.354 by root, Mon Feb 21 07:41:02 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 <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.end (); cc-- > v.begin (); )
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
111	}
112		113
113	// allocate a new combination	114	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	116	{
116	static int seen;	117	static int seen;
117		118
118	if (!seen++)	119	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		121
121	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
122	}	123	}
123		124
124	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
186	#endif	187	#endif
187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194		194
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
…		…
225	delete fontset[i];	225	delete fontset[i];
226	#endif	226	#endif
227	delete fontset[0];	227	delete fontset[0];
228		228
229	#ifdef HAVE_BG_PIXMAP	229	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	230	bg_destroy ();
231	#endif	231	#endif
232		232
233	if (display)	233	if (display)
234	{	234	{
235	selection_clear ();	235	selection_clear ();
		236	selection_clear (true);
236		237
237	#ifdef USE_XIM	238	#ifdef USE_XIM
238	im_destroy ();	239	im_destroy ();
239	#endif	240	#endif
240	#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[0])
…		…
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);
		271	free (selection.clip_text);
293	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
294	free (env_display);	273	free (env_display);
295	free (env_term);	274	free (env_term);
296	free (locale);	275	free (locale);
297	free (v_buffer);	276	free (v_buffer);
298	free (incr_buf);	277
		278	delete selection_req;
299		279
300	delete envv;	280	delete envv;
301	delete argv;	281	delete argv;
302		282
303	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
339	#endif	319	#endif
340	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
342	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
343	#endif	323	#endif
344	incr_ev.stop ();
345	termwin_ev.stop (display);	324	termwin_ev.stop (display);
346	vt_ev.stop (display);	325	vt_ev.stop (display);
347	}	326	}
348		327
349	flush_ev.stop ();	328	flush_ev.stop ();
…		…
371	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
372	{	351	{
373	make_current ();	352	make_current ();
374		353
375	delete this;	354	delete this;
		355	}
		356
		357	void
		358	rxvt_term::set_option (uint8_t opt, bool set)
		359	{
		360	if (!opt)
		361	return;
		362
		363	uint8_t mask = 1 << (opt & 7);
		364	uint8_t &val = options [opt >> 3];
		365
		366	val = val & ~mask \| (set ? mask : 0);
376	}	367	}
377		368
378	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
379	/*	370	/*
380	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
394	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
395	{	386	{
396	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
397	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
398	char number[32];	389	char number[32];
399	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402	rxvt_warn ("An X Error occured, trying to continue after report.\n");	393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
409	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411	mesg, BUFSIZ);	402	mesg, BUFSIZ);
412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413	}	404	}
414	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
415	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
416	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
417	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
418	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
419	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
420	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
421	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
422	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
423	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
424	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426	mesg, BUFSIZ);	417	mesg, BUFSIZ);
427	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429	mesg, BUFSIZ);	420	mesg, BUFSIZ);
430	else	421	else
431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432	mesg, BUFSIZ);	423	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434	}	425	}
435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436	mesg, BUFSIZ);	427	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438	}	429	}
439	#endif	430	#endif
440		431
441	int	432	int
…		…
488	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
489	w.stop ();	480	w.stop ();
490	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
491	}	482	}
492		483
		484	static void
		485	rxvt_get_ttymode (struct termios *tio)
		486	{
		487	if (tcgetattr (STDIN_FILENO, tio) < 0)
		488	memset (tio, 0, sizeof (struct termios));
		489
		490	for (int i = 0; i < NCCS; i++)
		491	tio->c_cc[i] = VDISABLE;
		492
		493	tio->c_cc[VINTR] = CINTR;
		494	tio->c_cc[VQUIT] = CQUIT;
		495	tio->c_cc[VERASE] = CERASE;
		496	#ifdef VERASE2
		497	tio->c_cc[VERASE2] = CERASE2;
		498	#endif
		499	tio->c_cc[VKILL] = CKILL;
		500	tio->c_cc[VEOF] = CEOF;
		501	tio->c_cc[VSTART] = CSTART;
		502	tio->c_cc[VSTOP] = CSTOP;
		503	tio->c_cc[VSUSP] = CSUSP;
		504	# ifdef VDSUSP
		505	tio->c_cc[VDSUSP] = CDSUSP;
		506	# endif
		507	# ifdef VREPRINT
		508	tio->c_cc[VREPRINT] = CRPRNT;
		509	# endif
		510	# ifdef VDISCRD
		511	tio->c_cc[VDISCRD] = CFLUSH;
		512	# endif
		513	# ifdef VWERSE
		514	tio->c_cc[VWERSE] = CWERASE;
		515	# endif
		516	# ifdef VLNEXT
		517	tio->c_cc[VLNEXT] = CLNEXT;
		518	# endif
		519	# ifdef VSTATUS
		520	tio->c_cc[VSTATUS] = CSTATUS;
		521	# endif
		522
		523	# if VMIN != VEOF
		524	tio->c_cc[VMIN] = 1;
		525	# endif
		526	# if VTIME != VEOL
		527	tio->c_cc[VTIME] = 0;
		528	# endif
		529
		530	/* input modes */
		531	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		532	# ifdef IMAXBEL
		533	\| IMAXBEL
		534	# endif
		535	\| IXON);
		536
		537	/* output modes */
		538	tio->c_oflag = (OPOST \| ONLCR);
		539
		540	/* control modes */
		541	tio->c_cflag = (CS8 \| CREAD);
		542
		543	/* local modes */
		544	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		545	# if defined (ECHOCTL) && defined (ECHOKE)
		546	\| ECHOCTL \| ECHOKE
		547	# endif
		548	\| ECHOE \| ECHOK);
		549	}
		550
493	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
494		552
495	void	553	void
496	rxvt_init ()	554	rxvt_init ()
497	{	555	{
498	ptytty::init ();	556	assert (("fontMask must not overlap other RS masks",
		557	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
499		558
		559	rxvt_get_ttymode (&rxvt_term::def_tio);
		560
		561	// get rid of stdin/stdout as we don't need them, to free resources
		562	dup2 (STDERR_FILENO, STDIN_FILENO);
		563	dup2 (STDERR_FILENO, STDOUT_FILENO);
		564
500	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502		567
503	rxvt_environ = environ;	568	rxvt_environ = environ;
504		569
505	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
506	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
507		572
508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
512	/* signal (SIGURG, SIG_DFL); */
513		575
514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
516	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
517		579
…		…
525	*/	587	*/
526	void	588	void
527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	589	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528	{	590	{
529	short recalc_x, recalc_y;	591	short recalc_x, recalc_y;
530	int x, y, sb_w, flags;	592	int x, y, flags;
531	unsigned int w, h;	593	unsigned int w, h;
532	unsigned int max_width, max_height;	594	unsigned int max_width, max_height;
533		595
534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	596	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
535	szHint.win_gravity = NorthWestGravity;	597	szHint.win_gravity = NorthWestGravity;
…		…
545	if (rs[Rs_geometry])	607	if (rs[Rs_geometry])
546	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	608	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547		609
548	if (flags & WidthValue)	610	if (flags & WidthValue)
549	{	611	{
		612	if (!w)
		613	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		614
550	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	615	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551	szHint.flags \|= USSize;	616	szHint.flags \|= USSize;
552	}	617	}
553		618
554	if (flags & HeightValue)	619	if (flags & HeightValue)
555	{	620	{
		621	if (!h)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
556	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	624	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
558	}	626	}
559		627
560	if (flags & XValue)	628	if (flags & XValue)
561	{	629	{
…		…
592	max_width = MAX_COLS * fwidth;	660	max_width = MAX_COLS * fwidth;
593	max_height = MAX_ROWS * fheight;	661	max_height = MAX_ROWS * fheight;
594		662
595	szHint.base_width = szHint.base_height = 2 * int_bwidth;	663	szHint.base_width = szHint.base_height = 2 * int_bwidth;
596		664
597	sb_w = 0;
598	window_vt_x = window_vt_y = int_bwidth;	665	window_vt_x = window_vt_y = int_bwidth;
599		666
600	if (scrollBar.state)	667	if (scrollBar.state)
601	{	668	{
602	sb_w = scrollBar.total_width ();	669	int sb_w = scrollBar.total_width ();
603	szHint.base_width += sb_w;	670	szHint.base_width += sb_w;
604		671
605	if (!option (Opt_scrollBar_right))	672	if (!option (Opt_scrollBar_right))
606	window_vt_x += sb_w;	673	window_vt_x += sb_w;
607	}	674	}
…		…
631	{	698	{
632	min_it (height, max_height);	699	min_it (height, max_height);
633	szHint.height = szHint.base_height + height;	700	szHint.height = szHint.base_height + height;
634	}	701	}
635		702
636	if (scrollBar.state && option (Opt_scrollBar_right))
637	window_sb_x = szHint.width - sb_w;
638
639	if (recalc_x)	703	if (recalc_x)
640	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	704	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641		705
642	if (recalc_y)	706	if (recalc_y)
643	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644		708
645	ncol = width / fwidth;	709	ncol = width / fwidth;
646	nrow = height / fheight;	710	nrow = height / fheight;
647	}	711	}
648		712
649	/----------------------------------------------------------------------/	713	/----------------------------------------------------------------------/
650	/*	714	/*
…		…
661		725
662	ws.ws_col = ncol;	726	ws.ws_col = ncol;
663	ws.ws_row = nrow;	727	ws.ws_row = nrow;
664	ws.ws_xpixel = width;	728	ws.ws_xpixel = width;
665	ws.ws_ypixel = height;	729	ws.ws_ypixel = height;
666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	730	ioctl (pty->pty, TIOCSWINSZ, &ws);
667		731
668	#if 0	732	#if 0
669	// TIOCSWINSZ is supposed to do this automatically and correctly	733	// TIOCSWINSZ is supposed to do this automatically and correctly
670	if (cmd_pid) /* force through to the command */	734	if (cmd_pid) /* force through to the command */
671	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
…		…
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;
…		…
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[0], &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
…		…
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
…		…
872	void	949	void
873	rxvt_term::set_colorfgbg ()	950	rxvt_term::set_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";
878		956
879	strcpy (fstr, "default");
880	strcpy (bstr, "default");
881	for (i = Color_Black; i <= Color_White; i++)	957	for (i = Color_Black; i <= Color_White; i++)
882	if (pix_colors[Color_fg] == pix_colors[i])	958	if (pix_colors[Color_fg] == pix_colors[i])
883	{	959	{
884	sprintf (fstr, "%d", (i - Color_Black));	960	sprintf (fstr, "%d", i - Color_Black);
885	break;	961	break;
886	}	962	}
887		963
888	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
889	if (pix_colors[Color_bg] == pix_colors[i])	965	if (pix_colors[Color_bg] == pix_colors[i])
890	{	966	{
891	sprintf (bstr, "%d", (i - Color_Black));	967	sprintf (bstr, "%d", i - Color_Black);
892	#ifdef BG_IMAGE_FROM_FILE	968	#ifdef BG_IMAGE_FROM_FILE
893	xpmb = "default;";	969	xpmb = "default;";
894	#endif	970	#endif
895	break;	971	break;
896	}	972	}
…		…
926	int old_width = szHint.width;	1002	int old_width = szHint.width;
927	int old_height = szHint.height;	1003	int old_height = szHint.height;
928		1004
929	window_calc (newwidth, newheight);	1005	window_calc (newwidth, newheight);
930		1006
931	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1007	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1008
		1009	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1010	if (set_hint)
		1011	{
		1012	szHint.flags &= ~(PBaseSize \| PResizeInc);
932	XSetWMNormalHints (dpy, parent[0], &szHint);	1013	XSetWMNormalHints (dpy, parent[0], &szHint);
		1014	szHint.flags \|= PBaseSize \| PResizeInc;
		1015	}
933		1016
934	if (!ignoreparent)	1017	if (!ignoreparent)
935	{	1018	{
936	#ifdef SMART_RESIZE	1019	#ifdef SMART_RESIZE
937	/*	1020	/*
…		…
977	#else	1060	#else
978	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1061	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
979	#endif	1062	#endif
980	}	1063	}
981		1064
		1065	if (set_hint)
		1066	XSetWMNormalHints (dpy, parent[0], &szHint);
		1067
982	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1068	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
983		1069
984	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1070	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
985	{	1071	{
986	if (scrollBar.state)	1072	if (scrollBar.state)
987	{	1073	scrollBar.resize ();
988	XMoveResizeWindow (dpy, scrollBar.win,
989	window_sb_x, 0,
990	scrollBar.total_width (), szHint.height);
991	resize_scrollbar ();
992	}
993		1074
994	XMoveResizeWindow (dpy, vt,	1075	XMoveResizeWindow (dpy, vt,
995	window_vt_x, window_vt_y,	1076	window_vt_x, window_vt_y,
996	width, height);	1077	width, height);
997		1078
998	#ifdef HAVE_BG_PIXMAP	1079	#ifdef HAVE_BG_PIXMAP
999	if (bgPixmap.window_size_sensitive ())	1080	if (bg_window_size_sensitive ())
1000	update_background ();	1081	update_background ();
1001	#endif	1082	#endif
1002
1003	scr_clear ();
1004	}	1083	}
1005		1084
1006	if (fix_screen \|\| old_height == 0)	1085	if (fix_screen \|\| old_height == 0)
1007	scr_reset ();	1086	scr_reset ();
1008
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		1087
1018	#ifdef USE_XIM	1088	#ifdef USE_XIM
1019	IMSetPosition ();	1089	IMSetPosition ();
1020	#endif	1090	#endif
1021	}	1091	}
…		…
1087		1157
1088	/* Checking whether input method is running. */	1158	/* Checking whether input method is running. */
1089	bool	1159	bool
1090	rxvt_term::IMisRunning ()	1160	rxvt_term::IMisRunning ()
1091	{	1161	{
1092	char *p;
1093	Atom atom;	1162	Atom atom;
1094	Window win;	1163	Window win;
1095	char server[IMBUFSIZ];	1164	char server[IMBUFSIZ];
1096		1165
1097	/* get current locale modifier */	1166	/* get current locale modifier */
1098	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1167	if (char *p = XSetLocaleModifiers (0))
1099	{	1168	{
1100	strcpy (server, "@server=");	1169	strcpy (server, "@server=");
1101	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1170	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1102		1171
1103	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1172	if (p = strchr (server + 1, '@')) /* first one only */
1104	*p = '\0';	1173	*p = '\0';
1105		1174
1106	atom = XInternAtom (dpy, server, False);	1175	atom = XInternAtom (dpy, server, False);
1107	win = XGetSelectionOwner (dpy, atom);	1176	win = XGetSelectionOwner (dpy, atom);
1108		1177
1109	if (win != None)	1178	if (win != None)
1110	return True;	1179	return true;
1111	}	1180	}
1112		1181
1113	return False;	1182	return false;
1114	}	1183	}
1115		1184
1116	void	1185	void
1117	rxvt_term::IMSendSpot ()	1186	rxvt_term::IMSendSpot ()
1118	{	1187	{
…		…
1175		1244
1176	term->make_current ();	1245	term->make_current ();
1177		1246
1178	if (text)	1247	if (text)
1179	{	1248	{
1180	void *str;	1249	wchar_t *str;
1181		1250
1182	if (!text->encoding_is_wchar && text->string.multi_byte)	1251	if (!text->encoding_is_wchar && text->string.multi_byte)
1183	{	1252	{
1184	// of course, X makes it ugly again	1253	// of course, X makes it ugly again
1185	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1186	SET_LOCALE (term->rs[Rs_imLocale]);	1255	SET_LOCALE (term->rs[Rs_imLocale]);
1187		1256
1188	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1257	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1189	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1258	mbstowcs (str, text->string.multi_byte, text->length + 1);
1190		1259
1191	if (term->rs[Rs_imLocale])	1260	if (term->rs[Rs_imLocale])
1192	SET_LOCALE (term->locale);	1261	SET_LOCALE (term->locale);
1193	}	1262	}
1194	else	1263	else
1195	str = (void *)text->string.wide_char;	1264	str = text->string.wide_char;
1196		1265
1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1266	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198	DT_INT, call_data->caret,	1267	DT_INT, call_data->caret,
1199	DT_INT, call_data->chg_first,	1268	DT_INT, call_data->chg_first,
1200	DT_INT, call_data->chg_length,	1269	DT_INT, call_data->chg_length,
…		…
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);
…		…
1467	p = rs[Rs_inputMethod];	1536	p = rs[Rs_inputMethod];
1468	if (p && *p)	1537	if (p && *p)
1469	{	1538	{
1470	bool found = false;	1539	bool found = false;
1471		1540
1472	s = rxvt_splitcommastring (p);	1541	s = rxvt_strsplit (',', p);
1473		1542
1474	for (i = 0; s[i]; i++)	1543	for (i = 0; s[i]; i++)
1475	{	1544	{
1476	if (*s[i])	1545	if (*s[i])
1477	{	1546	{
…		…
1483	break;	1552	break;
1484	}	1553	}
1485	}	1554	}
1486	}	1555	}
1487		1556
1488	rxvt_freecommastring (s);	1557	rxvt_free_strsplit (s);
1489		1558
1490	if (found)	1559	if (found)
1491	goto done;	1560	goto done;
1492	}	1561	}
1493		1562
…		…
1554	void	1623	void
1555	rxvt_term::get_window_origin (int &x, int &y)	1624	rxvt_term::get_window_origin (int &x, int &y)
1556	{	1625	{
1557	Window cr;	1626	Window cr;
1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1627	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560	}	1628	}
1561		1629
1562	Pixmap	1630	Pixmap
1563	rxvt_term::get_pixmap_property (int prop_id)	1631	rxvt_term::get_pixmap_property (Atom property)
1564	{	1632	{
1565	if (prop_id > 0 && prop_id < NUM_XA)	1633	Pixmap pixmap = None;
1566	if (xa[prop_id])	1634
1567	{
1568	int aformat;	1635	int aformat;
1569	unsigned long nitems, bytes_after;	1636	unsigned long nitems, bytes_after;
1570	Atom atype;	1637	Atom atype;
1571	unsigned char *prop = NULL;	1638	unsigned char *prop;
1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1639	int result = XGetWindowProperty (dpy, display->root, property,
1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1640	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574	&nitems, &bytes_after, &prop);	1641	&nitems, &bytes_after, &prop);
1575	if (result == Success && prop && atype == XA_PIXMAP)	1642	if (result == Success)
		1643	{
		1644	if (atype == XA_PIXMAP)
1576	return (Pixmap )prop;	1645	pixmap = (Pixmap )prop;
		1646	XFree (prop);
1577	}	1647	}
1578		1648
1579	return None;	1649	return pixmap;
1580	}	1650	}
1581		1651
1582	#ifdef HAVE_BG_PIXMAP	1652	#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		1653
1593	void	1654	void
1594	rxvt_term::update_background ()	1655	rxvt_term::update_background ()
1595	{	1656	{
1596	if (update_background_ev.is_active ())	1657	if (update_background_ev.is_active ())
1597	return;	1658	return;
1598		1659
1599	bgPixmap.invalidate ();	1660	bg_invalidate ();
1600		1661
1601	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1662	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602		1663
1603	if (to_wait <= 0.)	1664	if (to_wait <= 0.)
1604	bgPixmap.render ();	1665	bg_render ();
1605	else	1666	else
1606	update_background_ev.start (to_wait);	1667	update_background_ev.start (to_wait);
1607	}	1668	}
1608		1669
1609	void	1670	void
1610	rxvt_term::update_background_cb (ev::timer &w, int revents)	1671	rxvt_term::update_background_cb (ev::timer &w, int revents)
1611	{	1672	{
1612	make_current ();	1673	make_current ();
1613		1674
1614	update_background_ev.stop ();	1675	update_background_ev.stop ();
1615	bgPixmap.render ();	1676	bg_render ();
1616	refresh_check ();	1677	refresh_check ();
1617	}	1678	}
1618		1679
1619	#endif /* HAVE_BG_PIXMAP */	1680	#endif /* HAVE_BG_PIXMAP */
1620		1681

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.354 by root, Mon Feb 21 07:41:02 2011 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.354 by root, Mon Feb 21 07:41:02 2011 UTC