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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.301 by ayin, Sat Jan 19 13:00:10 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-2007 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));
…		…
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	174	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	177	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	179	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	181	#endif
183	#ifdef POINTER_BLANK	182	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
227	delete fontset[i];	226	delete fontset[i];
228	#endif	227	#endif
229	delete fontset[0];	228	delete fontset[0];
230		229
231	#ifdef HAVE_BG_PIXMAP	230	#ifdef HAVE_BG_PIXMAP
232	bgPixmap.destroy ();	231	bg_destroy ();
233	#endif	232	#endif
234		233
235	if (display)	234	if (display)
236	{	235	{
237	selection_clear ();	236	selection_clear ();
		237	selection_clear (true);
238		238
239	#ifdef USE_XIM	239	#ifdef USE_XIM
240	im_destroy ();	240	im_destroy ();
241	#endif	241	#endif
242	#ifdef XTERM_SCROLLBAR	242	scrollBar.destroy ();
243	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244	if (ShadowGC) XFreeGC (dpy, ShadowGC);
245	#endif
246	#ifdef PLAIN_SCROLLBAR
247	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248	#endif
249	#ifdef NEXT_SCROLLBAR
250	if (blackGC) XFreeGC (dpy, blackGC);
251	if (whiteGC) XFreeGC (dpy, whiteGC);
252	if (grayGC) XFreeGC (dpy, grayGC);
253	if (darkGC) XFreeGC (dpy, darkGC);
254	if (stippleGC) XFreeGC (dpy, stippleGC);
255	if (dimple) XFreePixmap (dpy, dimple);
256	if (upArrow) XFreePixmap (dpy, upArrow);
257	if (downArrow) XFreePixmap (dpy, downArrow);
258	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260	#endif
261	#ifdef RXVT_SCROLLBAR
262	if (topShadowGC) XFreeGC (dpy, topShadowGC);
263	if (botShadowGC) XFreeGC (dpy, botShadowGC);
264	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265	#endif
266	if (gc) XFreeGC (dpy, gc);	243	if (gc) XFreeGC (dpy, gc);
267		244
268	delete drawable;	245	delete drawable;
269	// destroy all windows	246	// destroy all windows
270	if (parent[0])	247	if (parent[0])
…		…
290	/* clear all resources */	267	/* clear all resources */
291	for (int i = 0; i < allocated.size (); i++)	268	for (int i = 0; i < allocated.size (); i++)
292	free (allocated [i]);	269	free (allocated [i]);
293		270
294	free (selection.text);	271	free (selection.text);
		272	free (selection.clip_text);
295	// TODO: manage env vars in child only(!)	273	// TODO: manage env vars in child only(!)
296	free (env_display);	274	free (env_display);
297	free (env_term);	275	free (env_term);
298	free (locale);	276	free (locale);
299	free (v_buffer);	277	free (v_buffer);
…		…
337	if (display)	315	if (display)
338	{	316	{
339	#if USE_XIM	317	#if USE_XIM
340	im_ev.stop (display);	318	im_ev.stop (display);
341	#endif	319	#endif
342	#if HAVE_SCROLLBARS
343	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
344	#endif
345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
346	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
347	#endif	323	#endif
348	incr_ev.stop ();	324	incr_ev.stop ();
349	termwin_ev.stop (display);	325	termwin_ev.stop (display);
…		…
375	rxvt_term::destroy_cb (ev::idle &w, int revents)	351	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	352	{
377	make_current ();	353	make_current ();
378		354
379	delete this;	355	delete this;
		356	}
		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);
380	}	368	}
381		369
382	/----------------------------------------------------------------------/	370	/----------------------------------------------------------------------/
383	/*	371	/*
384	* Exit gracefully, clearing the utmp entry and restoring tty attributes	372	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
398	print_x_error (Display dpy, XErrorEvent event)	386	print_x_error (Display dpy, XErrorEvent event)
399	{	387	{
400	char buffer[BUFSIZ];	388	char buffer[BUFSIZ];
401	char mesg[BUFSIZ];	389	char mesg[BUFSIZ];
402	char number[32];	390	char number[32];
403	char *mtype = "XlibMessage";	391	const char mtype[] = "XlibMessage";
404	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	392	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	393	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406	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");
407	rxvt_warn ("%s: %s\n", mesg, buffer);	395	rxvt_warn ("%s: %s\n", mesg, buffer);
408	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	396	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	397	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410	sprintf(number, "%d", event->request_code);	398	sprintf(number, "%d", event->request_code);
411	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	399	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412	rxvt_warn ("(which is %s)\n", buffer);	400	rxvt_warn ("(which is %s)\n", buffer);
413	if (event->request_code >= 128) {	401	if (event->request_code >= 128) {
414	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	402	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415	mesg, BUFSIZ);	403	mesg, BUFSIZ);
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	404	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417	}	405	}
418	if ((event->error_code == BadWindow) \|\|	406	if ((event->error_code == BadWindow) \|\|
419	(event->error_code == BadPixmap) \|\|	407	(event->error_code == BadPixmap) \|\|
420	(event->error_code == BadCursor) \|\|	408	(event->error_code == BadCursor) \|\|
421	(event->error_code == BadFont) \|\|	409	(event->error_code == BadFont) \|\|
422	(event->error_code == BadDrawable) \|\|	410	(event->error_code == BadDrawable) \|\|
423	(event->error_code == BadColor) \|\|	411	(event->error_code == BadColor) \|\|
424	(event->error_code == BadGC) \|\|	412	(event->error_code == BadGC) \|\|
425	(event->error_code == BadIDChoice) \|\|	413	(event->error_code == BadIDChoice) \|\|
426	(event->error_code == BadValue) \|\|	414	(event->error_code == BadValue) \|\|
427	(event->error_code == BadAtom)) {	415	(event->error_code == BadAtom)) {
428	if (event->error_code == BadValue)	416	if (event->error_code == BadValue)
429	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430	mesg, BUFSIZ);	418	mesg, BUFSIZ);
431	else if (event->error_code == BadAtom)	419	else if (event->error_code == BadAtom)
432	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	420	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433	mesg, BUFSIZ);	421	mesg, BUFSIZ);
434	else	422	else
435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	423	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436	mesg, BUFSIZ);	424	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438	}	426	}
439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	427	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440	mesg, BUFSIZ);	428	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	429	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442	}	430	}
443	#endif	431	#endif
444		432
445	int	433	int
…		…
492	rxvt_emergency_cleanup ();	480	rxvt_emergency_cleanup ();
493	w.stop ();	481	w.stop ();
494	kill (getpid (), w.signum);	482	kill (getpid (), w.signum);
495	}	483	}
496		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
497	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
498		553
499	void	554	void
500	rxvt_init ()	555	rxvt_init ()
501	{	556	{
502	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))));
503		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
504	if (!ev_default_loop (0))	566	if (!ev_default_loop ())
505	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	567	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506		568
507	rxvt_environ = environ;	569	rxvt_environ = environ;
508		570
509	signal (SIGHUP, SIG_IGN);	571	signal (SIGHUP, SIG_IGN);
510	signal (SIGPIPE, SIG_IGN);	572	signal (SIGPIPE, SIG_IGN);
511		573
512	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	574	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513	sig_handlers.sw_int.start (SIGINT); ev_unref ();	575	sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
516	/* signal (SIGURG, SIG_DFL); */
517		576
518	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	577	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519	// TODO: handle this with exceptions and tolerate the memory loss	578	// TODO: handle this with exceptions and tolerate the memory loss
520	XSetIOErrorHandler (rxvt_xioerror_handler);	579	XSetIOErrorHandler (rxvt_xioerror_handler);
521		580
…		…
529	*/	588	*/
530	void	589	void
531	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	590	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532	{	591	{
533	short recalc_x, recalc_y;	592	short recalc_x, recalc_y;
534	int x, y, sb_w, flags;	593	int x, y, flags;
535	unsigned int w, h;	594	unsigned int w, h;
536	unsigned int max_width, max_height;	595	unsigned int max_width, max_height;
537		596
538	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	597	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
539	szHint.win_gravity = NorthWestGravity;	598	szHint.win_gravity = NorthWestGravity;
…		…
549	if (rs[Rs_geometry])	608	if (rs[Rs_geometry])
550	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	609	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551		610
552	if (flags & WidthValue)	611	if (flags & WidthValue)
553	{	612	{
		613	if (!w)
		614	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		615
554	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	616	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555	szHint.flags \|= USSize;	617	szHint.flags \|= USSize;
556	}	618	}
557		619
558	if (flags & HeightValue)	620	if (flags & HeightValue)
559	{	621	{
		622	if (!h)
		623	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		624
560	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	625	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561	szHint.flags \|= USSize;	626	szHint.flags \|= USSize;
562	}	627	}
563		628
564	if (flags & XValue)	629	if (flags & XValue)
565	{	630	{
…		…
596	max_width = MAX_COLS * fwidth;	661	max_width = MAX_COLS * fwidth;
597	max_height = MAX_ROWS * fheight;	662	max_height = MAX_ROWS * fheight;
598		663
599	szHint.base_width = szHint.base_height = 2 * int_bwidth;	664	szHint.base_width = szHint.base_height = 2 * int_bwidth;
600		665
601	sb_w = 0;
602	window_vt_x = window_vt_y = int_bwidth;	666	window_vt_x = window_vt_y = int_bwidth;
603		667
604	if (scrollBar.state)	668	if (scrollBar.state)
605	{	669	{
606	sb_w = scrollbar_TotalWidth ();	670	int sb_w = scrollBar.total_width ();
607	szHint.base_width += sb_w;	671	szHint.base_width += sb_w;
608		672
609	if (!option (Opt_scrollBar_right))	673	if (!option (Opt_scrollBar_right))
610	window_vt_x += sb_w;	674	window_vt_x += sb_w;
611	}	675	}
…		…
635	{	699	{
636	min_it (height, max_height);	700	min_it (height, max_height);
637	szHint.height = szHint.base_height + height;	701	szHint.height = szHint.base_height + height;
638	}	702	}
639		703
640	if (scrollBar.state && option (Opt_scrollBar_right))
641	window_sb_x = szHint.width - sb_w;
642
643	if (recalc_x)	704	if (recalc_x)
644	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	705	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645		706
646	if (recalc_y)	707	if (recalc_y)
647	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	708	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648		709
649	ncol = width / fwidth;	710	ncol = width / fwidth;
650	nrow = height / fheight;	711	nrow = height / fheight;
651	}	712	}
652		713
653	/----------------------------------------------------------------------/	714	/----------------------------------------------------------------------/
654	/*	715	/*
…		…
665		726
666	ws.ws_col = ncol;	727	ws.ws_col = ncol;
667	ws.ws_row = nrow;	728	ws.ws_row = nrow;
668	ws.ws_xpixel = width;	729	ws.ws_xpixel = width;
669	ws.ws_ypixel = height;	730	ws.ws_ypixel = height;
670	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	731	ioctl (pty->pty, TIOCSWINSZ, &ws);
671		732
672	#if 0	733	#if 0
673	// TIOCSWINSZ is supposed to do this automatically and correctly	734	// TIOCSWINSZ is supposed to do this automatically and correctly
674	if (cmd_pid) /* force through to the command */	735	if (cmd_pid) /* force through to the command */
675	kill (-cmd_pid, SIGWINCH);	736	kill (-cmd_pid, SIGWINCH);
…		…
705	#endif	766	#endif
706		767
707	delete fontset[0];	768	delete fontset[0];
708	fontset[0] = fs;	769	fontset[0] = fs;
709		770
710	prop = (*fs)[1]->properties ();	771	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711	prop.height += lineSpace;	772	prop.height += lineSpace;
		773	prop.width += letterSpace;
712		774
713	fs->set_prop (prop, false);	775	fs->set_prop (prop, false);
714		776
715	fwidth = prop.width;	777	fwidth = prop.width;
716	fheight = prop.height;	778	fheight = prop.height;
…		…
766	prop, XA_STRING, 8, PropModeReplace,	828	prop, XA_STRING, 8, PropModeReplace,
767	(const unsigned char *)str, len >= 0 ? len : strlen (str));	829	(const unsigned char *)str, len >= 0 ? len : strlen (str));
768	}	830	}
769		831
770	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
771	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)
772	{	846	{
773	wchar_t *ws = rxvt_mbstowcs (str, len);	847	wchar_t *ws = rxvt_mbstowcs (str, len);
774	char *s = rxvt_wcstoutf8 (ws);	848	char *s = rxvt_wcstoutf8 (ws);
775		849
…		…
785	/----------------------------------------------------------------------/	859	/----------------------------------------------------------------------/
786	/* xterm sequences - title, iconName, color (exptl) */	860	/* xterm sequences - title, iconName, color (exptl) */
787	void	861	void
788	rxvt_term::set_title (const char *str)	862	rxvt_term::set_title (const char *str)
789	{	863	{
790	set_string_property (XA_WM_NAME, str);	864	set_mbstring_property (XA_WM_NAME, str);
791	#if ENABLE_EWMH	865	#if ENABLE_EWMH
792	set_utf8_property (xa[XA_NET_WM_NAME], str);	866	set_utf8_property (xa[XA_NET_WM_NAME], str);
793	#endif	867	#endif
794	}	868	}
795		869
796	void	870	void
797	rxvt_term::set_icon_name (const char *str)	871	rxvt_term::set_icon_name (const char *str)
798	{	872	{
799	set_string_property (XA_WM_ICON_NAME, str);	873	set_mbstring_property (XA_WM_ICON_NAME, str);
800	#if ENABLE_EWMH	874	#if ENABLE_EWMH
801	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	875	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802	#endif	876	#endif
803	}	877	}
804		878
805	void	879	void
806	rxvt_term::set_window_color (int idx, const char *color)	880	rxvt_term::set_window_color (int idx, const char *color)
807	{	881	{
808	#ifdef XTERM_COLOR_CHANGE	882	#ifdef XTERM_COLOR_CHANGE
809	rxvt_color xcol;	883	rxvt_color xcol;
810	int i;
811		884
812	if (color == NULL \|\| *color == '\0')	885	if (color == NULL \|\| *color == '\0')
813	return;	886	return;
814		887
815	color = strdup (color);	888	color = strdup (color);
…		…
817	rs[Rs_color + idx] = color;	890	rs[Rs_color + idx] = color;
818		891
819	/* handle color aliases */	892	/* handle color aliases */
820	if (isdigit (*color))	893	if (isdigit (*color))
821	{	894	{
822	i = atoi (color);	895	int i = atoi (color);
823		896
824	if (i >= 8 && i <= 15)	897	if (i >= 8 && i <= 15)
825	{	898	{
826	/* bright colors */	899	/* bright colors */
827	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	900	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
877	void	950	void
878	rxvt_term::set_colorfgbg ()	951	rxvt_term::set_colorfgbg ()
879	{	952	{
880	unsigned int i;	953	unsigned int i;
881	const char *xpmb = "";	954	const char *xpmb = "";
882	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	955	char fstr[] = "default";
		956	char bstr[] = "default";
883		957
884	strcpy (fstr, "default");
885	strcpy (bstr, "default");
886	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
887	if (pix_colors[Color_fg] == pix_colors[i])	959	if (pix_colors[Color_fg] == pix_colors[i])
888	{	960	{
889	sprintf (fstr, "%d", (i - Color_Black));	961	sprintf (fstr, "%d", i - Color_Black);
890	break;	962	break;
891	}	963	}
892		964
893	for (i = Color_Black; i <= Color_White; i++)	965	for (i = Color_Black; i <= Color_White; i++)
894	if (pix_colors[Color_bg] == pix_colors[i])	966	if (pix_colors[Color_bg] == pix_colors[i])
895	{	967	{
896	sprintf (bstr, "%d", (i - Color_Black));	968	sprintf (bstr, "%d", i - Color_Black);
897	#ifdef BG_IMAGE_FROM_FILE	969	#ifdef BG_IMAGE_FROM_FILE
898	xpmb = "default;";	970	xpmb = "default;";
899	#endif	971	#endif
900	break;	972	break;
901	}	973	}
…		…
931	int old_width = szHint.width;	1003	int old_width = szHint.width;
932	int old_height = szHint.height;	1004	int old_height = szHint.height;
933		1005
934	window_calc (newwidth, newheight);	1006	window_calc (newwidth, newheight);
935		1007
936	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);
937	XSetWMNormalHints (dpy, parent[0], &szHint);	1014	XSetWMNormalHints (dpy, parent[0], &szHint);
		1015	szHint.flags \|= PBaseSize \| PResizeInc;
		1016	}
938		1017
939	if (!ignoreparent)	1018	if (!ignoreparent)
940	{	1019	{
941	#ifdef SMART_RESIZE	1020	#ifdef SMART_RESIZE
942	/*	1021	/*
…		…
982	#else	1061	#else
983	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1062	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
984	#endif	1063	#endif
985	}	1064	}
986		1065
		1066	if (set_hint)
		1067	XSetWMNormalHints (dpy, parent[0], &szHint);
		1068
987	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1069	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
988		1070
989	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1071	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
990	{	1072	{
991	if (scrollBar.state)	1073	if (scrollBar.state)
992	{	1074	scrollBar.resize ();
993	XMoveResizeWindow (dpy, scrollBar.win,
994	window_sb_x, 0,
995	scrollbar_TotalWidth (), szHint.height);
996	resize_scrollbar ();
997	}
998		1075
999	XMoveResizeWindow (dpy, vt,	1076	XMoveResizeWindow (dpy, vt,
1000	window_vt_x, window_vt_y,	1077	window_vt_x, window_vt_y,
1001	width, height);	1078	width, height);
1002		1079
1003	#ifdef HAVE_BG_PIXMAP	1080	#ifdef HAVE_BG_PIXMAP
1004	if (bgPixmap.window_size_sensitive ())	1081	if (bg_window_size_sensitive ())
1005	update_background ();	1082	update_background ();
1006	#endif	1083	#endif
1007
1008	scr_clear ();
1009	}	1084	}
1010		1085
1011	if (fix_screen \|\| old_height == 0)	1086	if (fix_screen \|\| old_height == 0)
1012	scr_reset ();	1087	scr_reset ();
1013
1014	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1015	//scr_touch (false);
1016
1017	#ifdef HAVE_BG_PIXMAP
1018	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019	// if (bgPixmap.pixmap)
1020	// scr_touch (false);
1021	#endif
1022		1088
1023	#ifdef USE_XIM	1089	#ifdef USE_XIM
1024	IMSetPosition ();	1090	IMSetPosition ();
1025	#endif	1091	#endif
1026	}	1092	}
…		…
1092		1158
1093	/* Checking whether input method is running. */	1159	/* Checking whether input method is running. */
1094	bool	1160	bool
1095	rxvt_term::IMisRunning ()	1161	rxvt_term::IMisRunning ()
1096	{	1162	{
1097	char *p;
1098	Atom atom;	1163	Atom atom;
1099	Window win;	1164	Window win;
1100	char server[IMBUFSIZ];	1165	char server[IMBUFSIZ];
1101		1166
1102	/* get current locale modifier */	1167	/* get current locale modifier */
1103	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1168	if (char *p = XSetLocaleModifiers (0))
1104	{	1169	{
1105	strcpy (server, "@server=");	1170	strcpy (server, "@server=");
1106	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1171	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107		1172
1108	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1173	if (p = strchr (server + 1, '@')) /* first one only */
1109	*p = '\0';	1174	*p = '\0';
1110		1175
1111	atom = XInternAtom (dpy, server, False);	1176	atom = XInternAtom (dpy, server, False);
1112	win = XGetSelectionOwner (dpy, atom);	1177	win = XGetSelectionOwner (dpy, atom);
1113		1178
…		…
1180		1245
1181	term->make_current ();	1246	term->make_current ();
1182		1247
1183	if (text)	1248	if (text)
1184	{	1249	{
1185	void *str;	1250	wchar_t *str;
1186		1251
1187	if (!text->encoding_is_wchar && text->string.multi_byte)	1252	if (!text->encoding_is_wchar && text->string.multi_byte)
1188	{	1253	{
1189	// of course, X makes it ugly again	1254	// of course, X makes it ugly again
1190	if (term->rs[Rs_imLocale])	1255	if (term->rs[Rs_imLocale])
1191	SET_LOCALE (term->rs[Rs_imLocale]);	1256	SET_LOCALE (term->rs[Rs_imLocale]);
1192		1257
1193	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1258	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1259	mbstowcs (str, text->string.multi_byte, text->length + 1);
1195		1260
1196	if (term->rs[Rs_imLocale])	1261	if (term->rs[Rs_imLocale])
1197	SET_LOCALE (term->locale);	1262	SET_LOCALE (term->locale);
1198	}	1263	}
1199	else	1264	else
1200	str = (void *)text->string.wide_char;	1265	str = text->string.wide_char;
1201		1266
1202	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1267	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203	DT_INT, call_data->caret,	1268	DT_INT, call_data->caret,
1204	DT_INT, call_data->chg_first,	1269	DT_INT, call_data->chg_first,
1205	DT_INT, call_data->chg_length,	1270	DT_INT, call_data->chg_length,
…		…
1276	p = pet[pi];	1341	p = pet[pi];
1277		1342
1278	if (!p)	1343	if (!p)
1279	continue;	1344	continue;
1280		1345
1281	s = rxvt_splitcommastring (p);	1346	s = rxvt_strsplit (',', p);
1282		1347
1283	for (i = found = 0; !found && s[i]; i++)	1348	for (i = found = 0; !found && s[i]; i++)
1284	{	1349	{
1285	if (!strcmp (s[i], "OverTheSpot"))	1350	if (!strcmp (s[i], "OverTheSpot"))
1286	input_style = XIMPreeditPosition \| XIMStatusNothing;	1351	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1298	input_style = XIMPreeditNothing \| XIMStatusNothing;	1363	input_style = XIMPreeditNothing \| XIMStatusNothing;
1299		1364
1300	for (j = 0; j < xim_styles->count_styles; j++)	1365	for (j = 0; j < xim_styles->count_styles; j++)
1301	if (input_style == xim_styles->supported_styles[j])	1366	if (input_style == xim_styles->supported_styles[j])
1302	{	1367	{
1303	rxvt_freecommastring (s);	1368	rxvt_free_strsplit (s);
1304		1369
1305	found = 1;	1370	found = 1;
1306	goto foundpet;	1371	goto foundpet;
1307	}	1372	}
1308		1373
1309	}	1374	}
1310		1375
1311	rxvt_freecommastring (s);	1376	rxvt_free_strsplit (s);
1312	}	1377	}
1313		1378
1314	foundpet:	1379	foundpet:
1315		1380
1316	XFree (xim_styles);	1381	XFree (xim_styles);
…		…
1472	p = rs[Rs_inputMethod];	1537	p = rs[Rs_inputMethod];
1473	if (p && *p)	1538	if (p && *p)
1474	{	1539	{
1475	bool found = false;	1540	bool found = false;
1476		1541
1477	s = rxvt_splitcommastring (p);	1542	s = rxvt_strsplit (',', p);
1478		1543
1479	for (i = 0; s[i]; i++)	1544	for (i = 0; s[i]; i++)
1480	{	1545	{
1481	if (*s[i])	1546	if (*s[i])
1482	{	1547	{
…		…
1488	break;	1553	break;
1489	}	1554	}
1490	}	1555	}
1491	}	1556	}
1492		1557
1493	rxvt_freecommastring (s);	1558	rxvt_free_strsplit (s);
1494		1559
1495	if (found)	1560	if (found)
1496	goto done;	1561	goto done;
1497	}	1562	}
1498		1563
…		…
1559	void	1624	void
1560	rxvt_term::get_window_origin (int &x, int &y)	1625	rxvt_term::get_window_origin (int &x, int &y)
1561	{	1626	{
1562	Window cr;	1627	Window cr;
1563	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1628	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1564	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565	}	1629	}
1566		1630
1567	Pixmap	1631	Pixmap
1568	rxvt_term::get_pixmap_property (int prop_id)	1632	rxvt_term::get_pixmap_property (Atom property)
1569	{	1633	{
1570	if (prop_id > 0 && prop_id < NUM_XA)	1634	Pixmap pixmap = None;
1571	if (xa[prop_id])	1635
1572	{
1573	int aformat;	1636	int aformat;
1574	unsigned long nitems, bytes_after;	1637	unsigned long nitems, bytes_after;
1575	Atom atype;	1638	Atom atype;
1576	unsigned char *prop = NULL;	1639	unsigned char *prop;
1577	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1640	int result = XGetWindowProperty (dpy, display->root, property,
1578	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1641	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579	&nitems, &bytes_after, &prop);	1642	&nitems, &bytes_after, &prop);
1580	if (result == Success && prop && atype == XA_PIXMAP)	1643	if (result == Success)
		1644	{
		1645	if (atype == XA_PIXMAP)
1581	return (Pixmap )prop;	1646	pixmap = (Pixmap )prop;
		1647	XFree (prop);
1582	}	1648	}
1583		1649
1584	return None;	1650	return pixmap;
1585	}	1651	}
1586		1652
1587	#ifdef HAVE_BG_PIXMAP	1653	#ifdef HAVE_BG_PIXMAP
1588	# if TRACE_PIXMAPS
1589	# undef update_background
1590	void
1591	rxvt_term::trace_update_background (const char *file, int line)
1592	{
1593	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594	update_background ();
1595	}
1596	# endif
1597		1654
1598	void	1655	void
1599	rxvt_term::update_background ()	1656	rxvt_term::update_background ()
1600	{	1657	{
1601	if (update_background_ev.is_active ())	1658	if (update_background_ev.is_active ())
1602	return;	1659	return;
1603		1660
1604	bgPixmap.invalidate ();	1661	bg_invalidate ();
1605		1662
1606	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1663	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1607		1664
1608	if (to_wait <= 0.)	1665	if (to_wait <= 0.)
1609	bgPixmap.render ();	1666	bg_render ();
1610	else	1667	else
1611	update_background_ev.start (to_wait);	1668	update_background_ev.start (to_wait);
1612	}	1669	}
1613		1670
1614	void	1671	void
1615	rxvt_term::update_background_cb (ev::timer &w, int revents)	1672	rxvt_term::update_background_cb (ev::timer &w, int revents)
1616	{	1673	{
1617	make_current ();	1674	make_current ();
1618		1675
1619	update_background_ev.stop ();	1676	update_background_ev.stop ();
1620	bgPixmap.render ();	1677	bg_render ();
1621	refresh_check ();	1678	refresh_check ();
1622	}	1679	}
1623		1680
1624	#endif /* HAVE_BG_PIXMAP */	1681	#endif /* HAVE_BG_PIXMAP */
1625		1682

Diff Legend

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

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