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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
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	{	111	{
109	if (cc->c1 == c1 && cc->c2 == c2)	112	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	113	return COMPOSE_LO + (cc - v.begin ());
111	}	114	}
…		…
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	175	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	176	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	177	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	178	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	179	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	180	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	181	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	182	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	183	#endif
183	#ifdef POINTER_BLANK	184	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	185	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
229	delete fontset[0];	230	delete fontset[0];
230		231
231	#ifdef HAVE_BG_PIXMAP	232	#ifdef HAVE_BG_PIXMAP
232	bgPixmap.destroy ();	233	bgPixmap.destroy ();
233	#endif	234	#endif
		235	#ifdef HAVE_AFTERIMAGE
		236	if (asv)
		237	destroy_asvisual (asv, 0);
		238	if (asimman)
		239	destroy_image_manager (asimman, 0);
		240	#endif
234		241
235	if (display)	242	if (display)
236	{	243	{
237	selection_clear ();	244	selection_clear ();
		245	selection_clear (true);
238		246
239	#ifdef USE_XIM	247	#ifdef USE_XIM
240	im_destroy ();	248	im_destroy ();
241	#endif	249	#endif
242	#ifdef XTERM_SCROLLBAR	250	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);	251	if (gc) XFreeGC (dpy, gc);
267		252
268	delete drawable;	253	delete drawable;
269	// destroy all windows	254	// destroy all windows
270	if (parent[0])	255	if (parent[0])
…		…
290	/* clear all resources */	275	/* clear all resources */
291	for (int i = 0; i < allocated.size (); i++)	276	for (int i = 0; i < allocated.size (); i++)
292	free (allocated [i]);	277	free (allocated [i]);
293		278
294	free (selection.text);	279	free (selection.text);
		280	free (selection.clip_text);
295	// TODO: manage env vars in child only(!)	281	// TODO: manage env vars in child only(!)
296	free (env_display);	282	free (env_display);
297	free (env_term);	283	free (env_term);
298	free (locale);	284	free (locale);
299	free (v_buffer);	285	free (v_buffer);
…		…
337	if (display)	323	if (display)
338	{	324	{
339	#if USE_XIM	325	#if USE_XIM
340	im_ev.stop (display);	326	im_ev.stop (display);
341	#endif	327	#endif
342	#if HAVE_SCROLLBARS
343	scrollbar_ev.stop (display);	328	scrollbar_ev.stop (display);
344	#endif
345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	329	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
346	rootwin_ev.stop (display);	330	rootwin_ev.stop (display);
347	#endif	331	#endif
348	incr_ev.stop ();	332	incr_ev.stop ();
349	termwin_ev.stop (display);	333	termwin_ev.stop (display);
…		…
375	rxvt_term::destroy_cb (ev::idle &w, int revents)	359	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	360	{
377	make_current ();	361	make_current ();
378		362
379	delete this;	363	delete this;
		364	}
		365
		366	void
		367	rxvt_term::set_option (uint8_t opt, bool set)
		368	{
		369	if (!opt)
		370	return;
		371
		372	uint8_t mask = 1 << (opt & 7);
		373	uint8_t &val = options [opt >> 3];
		374
		375	val = val & ~mask \| (set ? mask : 0);
380	}	376	}
381		377
382	/----------------------------------------------------------------------/	378	/----------------------------------------------------------------------/
383	/*	379	/*
384	* Exit gracefully, clearing the utmp entry and restoring tty attributes	380	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
401	char mesg[BUFSIZ];	397	char mesg[BUFSIZ];
402	char number[32];	398	char number[32];
403	char *mtype = "XlibMessage";	399	char *mtype = "XlibMessage";
404	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406	rxvt_warn ("An X Error occured, trying to continue after report.\n");	402	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407	rxvt_warn ("%s: %s\n", mesg, buffer);	403	rxvt_warn ("%s: %s\n", mesg, buffer);
408	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410	sprintf(number, "%d", event->request_code);	406	sprintf(number, "%d", event->request_code);
411	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412	rxvt_warn ("(which is %s)\n", buffer);	408	rxvt_warn ("(which is %s)\n", buffer);
413	if (event->request_code >= 128) {	409	if (event->request_code >= 128) {
414	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415	mesg, BUFSIZ);	411	mesg, BUFSIZ);
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417	}	413	}
418	if ((event->error_code == BadWindow) \|\|	414	if ((event->error_code == BadWindow) \|\|
419	(event->error_code == BadPixmap) \|\|	415	(event->error_code == BadPixmap) \|\|
420	(event->error_code == BadCursor) \|\|	416	(event->error_code == BadCursor) \|\|
421	(event->error_code == BadFont) \|\|	417	(event->error_code == BadFont) \|\|
422	(event->error_code == BadDrawable) \|\|	418	(event->error_code == BadDrawable) \|\|
423	(event->error_code == BadColor) \|\|	419	(event->error_code == BadColor) \|\|
424	(event->error_code == BadGC) \|\|	420	(event->error_code == BadGC) \|\|
425	(event->error_code == BadIDChoice) \|\|	421	(event->error_code == BadIDChoice) \|\|
426	(event->error_code == BadValue) \|\|	422	(event->error_code == BadValue) \|\|
427	(event->error_code == BadAtom)) {	423	(event->error_code == BadAtom)) {
428	if (event->error_code == BadValue)	424	if (event->error_code == BadValue)
429	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430	mesg, BUFSIZ);	426	mesg, BUFSIZ);
431	else if (event->error_code == BadAtom)	427	else if (event->error_code == BadAtom)
432	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433	mesg, BUFSIZ);	429	mesg, BUFSIZ);
434	else	430	else
435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436	mesg, BUFSIZ);	432	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438	}	434	}
439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440	mesg, BUFSIZ);	436	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442	}	438	}
443	#endif	439	#endif
444		440
445	int	441	int
…		…
492	rxvt_emergency_cleanup ();	488	rxvt_emergency_cleanup ();
493	w.stop ();	489	w.stop ();
494	kill (getpid (), w.signum);	490	kill (getpid (), w.signum);
495	}	491	}
496		492
		493	static void
		494	rxvt_get_ttymode (struct termios *tio)
		495	{
		496	if (tcgetattr (STDIN_FILENO, tio) < 0)
		497	memset (tio, 0, sizeof (struct termios));
		498
		499	for (int i = 0; i < NCCS; i++)
		500	tio->c_cc[i] = VDISABLE;
		501
		502	tio->c_cc[VINTR] = CINTR;
		503	tio->c_cc[VQUIT] = CQUIT;
		504	tio->c_cc[VERASE] = CERASE;
		505	#ifdef VERASE2
		506	tio->c_cc[VERASE2] = CERASE2;
		507	#endif
		508	tio->c_cc[VKILL] = CKILL;
		509	tio->c_cc[VEOF] = CEOF;
		510	tio->c_cc[VSTART] = CSTART;
		511	tio->c_cc[VSTOP] = CSTOP;
		512	tio->c_cc[VSUSP] = CSUSP;
		513	# ifdef VDSUSP
		514	tio->c_cc[VDSUSP] = CDSUSP;
		515	# endif
		516	# ifdef VREPRINT
		517	tio->c_cc[VREPRINT] = CRPRNT;
		518	# endif
		519	# ifdef VDISCRD
		520	tio->c_cc[VDISCRD] = CFLUSH;
		521	# endif
		522	# ifdef VWERSE
		523	tio->c_cc[VWERSE] = CWERASE;
		524	# endif
		525	# ifdef VLNEXT
		526	tio->c_cc[VLNEXT] = CLNEXT;
		527	# endif
		528	# ifdef VSTATUS
		529	tio->c_cc[VSTATUS] = CSTATUS;
		530	# endif
		531
		532	# if VMIN != VEOF
		533	tio->c_cc[VMIN] = 1;
		534	# endif
		535	# if VTIME != VEOL
		536	tio->c_cc[VTIME] = 0;
		537	# endif
		538
		539	/* input modes */
		540	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		541	# ifdef IMAXBEL
		542	\| IMAXBEL
		543	# endif
		544	\| IXON);
		545
		546	/* output modes */
		547	tio->c_oflag = (OPOST \| ONLCR);
		548
		549	/* control modes */
		550	tio->c_cflag = (CS8 \| CREAD);
		551
		552	/* local modes */
		553	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		554	# if defined (ECHOCTL) && defined (ECHOKE)
		555	\| ECHOCTL \| ECHOKE
		556	# endif
		557	\| ECHOE \| ECHOK);
		558	}
		559
497	char **rxvt_environ; // startup environment	560	char **rxvt_environ; // startup environment
498		561
499	void	562	void
500	rxvt_init ()	563	rxvt_init ()
501	{	564	{
502	ptytty::init ();	565	assert (("fontMask must not overlap other RS masks",
		566	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
503		567
		568	rxvt_get_ttymode (&rxvt_term::def_tio);
		569
		570	// get rid of stdin/stdout as we don't need them, to free resources
		571	dup2 (STDERR_FILENO, STDIN_FILENO);
		572	dup2 (STDERR_FILENO, STDOUT_FILENO);
		573
504	if (!ev_default_loop (0))	574	if (!ev_default_loop ())
505	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	575	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506		576
507	rxvt_environ = environ;	577	rxvt_environ = environ;
508		578
509	signal (SIGHUP, SIG_IGN);	579	signal (SIGHUP, SIG_IGN);
510	signal (SIGPIPE, SIG_IGN);	580	signal (SIGPIPE, SIG_IGN);
511		581
512	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	582	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513	sig_handlers.sw_int.start (SIGINT); ev_unref ();	583	sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
516	/* signal (SIGURG, SIG_DFL); */
517		584
518	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	585	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519	// TODO: handle this with exceptions and tolerate the memory loss	586	// TODO: handle this with exceptions and tolerate the memory loss
520	XSetIOErrorHandler (rxvt_xioerror_handler);	587	XSetIOErrorHandler (rxvt_xioerror_handler);
521		588
…		…
529	*/	596	*/
530	void	597	void
531	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	598	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532	{	599	{
533	short recalc_x, recalc_y;	600	short recalc_x, recalc_y;
534	int x, y, sb_w, flags;	601	int x, y, flags;
535	unsigned int w, h;	602	unsigned int w, h;
536	unsigned int max_width, max_height;	603	unsigned int max_width, max_height;
537		604
538	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	605	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
539	szHint.win_gravity = NorthWestGravity;	606	szHint.win_gravity = NorthWestGravity;
…		…
549	if (rs[Rs_geometry])	616	if (rs[Rs_geometry])
550	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	617	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551		618
552	if (flags & WidthValue)	619	if (flags & WidthValue)
553	{	620	{
		621	if (!w)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
554	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	624	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
556	}	626	}
557		627
558	if (flags & HeightValue)	628	if (flags & HeightValue)
559	{	629	{
		630	if (!h)
		631	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		632
560	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	633	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561	szHint.flags \|= USSize;	634	szHint.flags \|= USSize;
562	}	635	}
563		636
564	if (flags & XValue)	637	if (flags & XValue)
565	{	638	{
…		…
596	max_width = MAX_COLS * fwidth;	669	max_width = MAX_COLS * fwidth;
597	max_height = MAX_ROWS * fheight;	670	max_height = MAX_ROWS * fheight;
598		671
599	szHint.base_width = szHint.base_height = 2 * int_bwidth;	672	szHint.base_width = szHint.base_height = 2 * int_bwidth;
600		673
601	sb_w = 0;
602	window_vt_x = window_vt_y = int_bwidth;	674	window_vt_x = window_vt_y = int_bwidth;
603		675
604	if (scrollBar.state)	676	if (scrollBar.state)
605	{	677	{
606	sb_w = scrollbar_TotalWidth ();	678	int sb_w = scrollBar.total_width ();
607	szHint.base_width += sb_w;	679	szHint.base_width += sb_w;
608		680
609	if (!option (Opt_scrollBar_right))	681	if (!option (Opt_scrollBar_right))
610	window_vt_x += sb_w;	682	window_vt_x += sb_w;
611	}	683	}
…		…
635	{	707	{
636	min_it (height, max_height);	708	min_it (height, max_height);
637	szHint.height = szHint.base_height + height;	709	szHint.height = szHint.base_height + height;
638	}	710	}
639		711
640	if (scrollBar.state && option (Opt_scrollBar_right))
641	window_sb_x = szHint.width - sb_w;
642
643	if (recalc_x)	712	if (recalc_x)
644	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	713	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645		714
646	if (recalc_y)	715	if (recalc_y)
647	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	716	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648		717
649	ncol = width / fwidth;	718	ncol = width / fwidth;
650	nrow = height / fheight;	719	nrow = height / fheight;
651	}	720	}
652		721
653	/----------------------------------------------------------------------/	722	/----------------------------------------------------------------------/
654	/*	723	/*
…		…
665		734
666	ws.ws_col = ncol;	735	ws.ws_col = ncol;
667	ws.ws_row = nrow;	736	ws.ws_row = nrow;
668	ws.ws_xpixel = width;	737	ws.ws_xpixel = width;
669	ws.ws_ypixel = height;	738	ws.ws_ypixel = height;
670	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	739	ioctl (pty->pty, TIOCSWINSZ, &ws);
671		740
672	#if 0	741	#if 0
673	// TIOCSWINSZ is supposed to do this automatically and correctly	742	// TIOCSWINSZ is supposed to do this automatically and correctly
674	if (cmd_pid) /* force through to the command */	743	if (cmd_pid) /* force through to the command */
675	kill (-cmd_pid, SIGWINCH);	744	kill (-cmd_pid, SIGWINCH);
…		…
705	#endif	774	#endif
706		775
707	delete fontset[0];	776	delete fontset[0];
708	fontset[0] = fs;	777	fontset[0] = fs;
709		778
710	prop = (*fs)[1]->properties ();	779	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711	prop.height += lineSpace;	780	prop.height += lineSpace;
		781	prop.width += letterSpace;
712		782
713	fs->set_prop (prop, false);	783	fs->set_prop (prop, false);
714		784
715	fwidth = prop.width;	785	fwidth = prop.width;
716	fheight = prop.height;	786	fheight = prop.height;
…		…
766	prop, XA_STRING, 8, PropModeReplace,	836	prop, XA_STRING, 8, PropModeReplace,
767	(const unsigned char *)str, len >= 0 ? len : strlen (str));	837	(const unsigned char *)str, len >= 0 ? len : strlen (str));
768	}	838	}
769		839
770	void	840	void
		841	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		842	{
		843	XTextProperty ct;
		844
		845	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		846	{
		847	XSetTextProperty (dpy, parent[0], &ct, prop);
		848	XFree (ct.value);
		849	}
		850	}
		851
		852	void
771	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	853	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772	{	854	{
773	wchar_t *ws = rxvt_mbstowcs (str, len);	855	wchar_t *ws = rxvt_mbstowcs (str, len);
774	char *s = rxvt_wcstoutf8 (ws);	856	char *s = rxvt_wcstoutf8 (ws);
775		857
…		…
785	/----------------------------------------------------------------------/	867	/----------------------------------------------------------------------/
786	/* xterm sequences - title, iconName, color (exptl) */	868	/* xterm sequences - title, iconName, color (exptl) */
787	void	869	void
788	rxvt_term::set_title (const char *str)	870	rxvt_term::set_title (const char *str)
789	{	871	{
790	set_string_property (XA_WM_NAME, str);	872	set_mbstring_property (XA_WM_NAME, str);
791	#if ENABLE_EWMH	873	#if ENABLE_EWMH
792	set_utf8_property (xa[XA_NET_WM_NAME], str);	874	set_utf8_property (xa[XA_NET_WM_NAME], str);
793	#endif	875	#endif
794	}	876	}
795		877
796	void	878	void
797	rxvt_term::set_icon_name (const char *str)	879	rxvt_term::set_icon_name (const char *str)
798	{	880	{
799	set_string_property (XA_WM_ICON_NAME, str);	881	set_mbstring_property (XA_WM_ICON_NAME, str);
800	#if ENABLE_EWMH	882	#if ENABLE_EWMH
801	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	883	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802	#endif	884	#endif
803	}	885	}
804		886
805	void	887	void
806	rxvt_term::set_window_color (int idx, const char *color)	888	rxvt_term::set_window_color (int idx, const char *color)
807	{	889	{
808	#ifdef XTERM_COLOR_CHANGE	890	#ifdef XTERM_COLOR_CHANGE
809	rxvt_color xcol;	891	rxvt_color xcol;
810	int i;
811		892
812	if (color == NULL \|\| *color == '\0')	893	if (color == NULL \|\| *color == '\0')
813	return;	894	return;
814		895
815	color = strdup (color);	896	color = strdup (color);
…		…
817	rs[Rs_color + idx] = color;	898	rs[Rs_color + idx] = color;
818		899
819	/* handle color aliases */	900	/* handle color aliases */
820	if (isdigit (*color))	901	if (isdigit (*color))
821	{	902	{
822	i = atoi (color);	903	int i = atoi (color);
823		904
824	if (i >= 8 && i <= 15)	905	if (i >= 8 && i <= 15)
825	{	906	{
826	/* bright colors */	907	/* bright colors */
827	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	908	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
931	int old_width = szHint.width;	1012	int old_width = szHint.width;
932	int old_height = szHint.height;	1013	int old_height = szHint.height;
933		1014
934	window_calc (newwidth, newheight);	1015	window_calc (newwidth, newheight);
935		1016
936	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1017	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1018
		1019	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1020	if (set_hint)
		1021	{
		1022	szHint.flags &= ~(PBaseSize \| PResizeInc);
937	XSetWMNormalHints (dpy, parent[0], &szHint);	1023	XSetWMNormalHints (dpy, parent[0], &szHint);
		1024	szHint.flags \|= PBaseSize \| PResizeInc;
		1025	}
938		1026
939	if (!ignoreparent)	1027	if (!ignoreparent)
940	{	1028	{
941	#ifdef SMART_RESIZE	1029	#ifdef SMART_RESIZE
942	/*	1030	/*
…		…
982	#else	1070	#else
983	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1071	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
984	#endif	1072	#endif
985	}	1073	}
986		1074
		1075	if (set_hint)
		1076	XSetWMNormalHints (dpy, parent[0], &szHint);
		1077
987	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1078	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
988		1079
989	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1080	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
990	{	1081	{
991	if (scrollBar.state)	1082	if (scrollBar.state)
992	{	1083	scrollBar.resize ();
993	XMoveResizeWindow (dpy, scrollBar.win,
994	window_sb_x, 0,
995	scrollbar_TotalWidth (), szHint.height);
996	resize_scrollbar ();
997	}
998		1084
999	XMoveResizeWindow (dpy, vt,	1085	XMoveResizeWindow (dpy, vt,
1000	window_vt_x, window_vt_y,	1086	window_vt_x, window_vt_y,
1001	width, height);	1087	width, height);
1002		1088
1003	#ifdef HAVE_BG_PIXMAP	1089	#ifdef HAVE_BG_PIXMAP
1004	if (bgPixmap.window_size_sensitive ())	1090	if (bgPixmap.window_size_sensitive ())
1005	update_background ();	1091	update_background ();
1006	#endif	1092	#endif
1007
1008	scr_clear ();
1009	}	1093	}
1010		1094
1011	if (fix_screen \|\| old_height == 0)	1095	if (fix_screen \|\| old_height == 0)
1012	scr_reset ();	1096	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		1097
1017	#ifdef HAVE_BG_PIXMAP	1098	#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 ?	1099	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019	// if (bgPixmap.pixmap)	1100	// if (bgPixmap.pixmap)
1020	// scr_touch (false);	1101	// scr_touch (false);
…		…
1092		1173
1093	/* Checking whether input method is running. */	1174	/* Checking whether input method is running. */
1094	bool	1175	bool
1095	rxvt_term::IMisRunning ()	1176	rxvt_term::IMisRunning ()
1096	{	1177	{
1097	char *p;
1098	Atom atom;	1178	Atom atom;
1099	Window win;	1179	Window win;
1100	char server[IMBUFSIZ];	1180	char server[IMBUFSIZ];
1101		1181
1102	/* get current locale modifier */	1182	/* get current locale modifier */
1103	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1183	if (char *p = XSetLocaleModifiers (0))
1104	{	1184	{
1105	strcpy (server, "@server=");	1185	strcpy (server, "@server=");
1106	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1186	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107		1187
1108	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1188	if (p = strchr (server + 1, '@')) /* first one only */
1109	*p = '\0';	1189	*p = '\0';
1110		1190
1111	atom = XInternAtom (dpy, server, False);	1191	atom = XInternAtom (dpy, server, False);
1112	win = XGetSelectionOwner (dpy, atom);	1192	win = XGetSelectionOwner (dpy, atom);
1113		1193
…		…
1180		1260
1181	term->make_current ();	1261	term->make_current ();
1182		1262
1183	if (text)	1263	if (text)
1184	{	1264	{
1185	void *str;	1265	wchar_t *str;
1186		1266
1187	if (!text->encoding_is_wchar && text->string.multi_byte)	1267	if (!text->encoding_is_wchar && text->string.multi_byte)
1188	{	1268	{
1189	// of course, X makes it ugly again	1269	// of course, X makes it ugly again
1190	if (term->rs[Rs_imLocale])	1270	if (term->rs[Rs_imLocale])
1191	SET_LOCALE (term->rs[Rs_imLocale]);	1271	SET_LOCALE (term->rs[Rs_imLocale]);
1192		1272
1193	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1273	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1274	mbstowcs (str, text->string.multi_byte, text->length + 1);
1195		1275
1196	if (term->rs[Rs_imLocale])	1276	if (term->rs[Rs_imLocale])
1197	SET_LOCALE (term->locale);	1277	SET_LOCALE (term->locale);
1198	}	1278	}
1199	else	1279	else
1200	str = (void *)text->string.wide_char;	1280	str = text->string.wide_char;
1201		1281
1202	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1282	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203	DT_INT, call_data->caret,	1283	DT_INT, call_data->caret,
1204	DT_INT, call_data->chg_first,	1284	DT_INT, call_data->chg_first,
1205	DT_INT, call_data->chg_length,	1285	DT_INT, call_data->chg_length,
…		…
1559	void	1639	void
1560	rxvt_term::get_window_origin (int &x, int &y)	1640	rxvt_term::get_window_origin (int &x, int &y)
1561	{	1641	{
1562	Window cr;	1642	Window cr;
1563	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1643	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1564	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565	}	1644	}
1566		1645
1567	Pixmap	1646	Pixmap
1568	rxvt_term::get_pixmap_property (int prop_id)	1647	rxvt_term::get_pixmap_property (Atom property)
1569	{	1648	{
1570	if (prop_id > 0 && prop_id < NUM_XA)	1649	Pixmap pixmap = None;
1571	if (xa[prop_id])	1650
1572	{
1573	int aformat;	1651	int aformat;
1574	unsigned long nitems, bytes_after;	1652	unsigned long nitems, bytes_after;
1575	Atom atype;	1653	Atom atype;
1576	unsigned char *prop = NULL;	1654	unsigned char *prop;
1577	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1655	int result = XGetWindowProperty (dpy, display->root, property,
1578	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1656	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579	&nitems, &bytes_after, &prop);	1657	&nitems, &bytes_after, &prop);
1580	if (result == Success && prop && atype == XA_PIXMAP)	1658	if (result == Success)
		1659	{
		1660	if (atype == XA_PIXMAP)
1581	return (Pixmap )prop;	1661	pixmap = (Pixmap )prop;
		1662	XFree (prop);
1582	}	1663	}
1583		1664
1584	return None;	1665	return pixmap;
1585	}	1666	}
1586		1667
1587	#ifdef HAVE_BG_PIXMAP	1668	#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		1669
1598	void	1670	void
1599	rxvt_term::update_background ()	1671	rxvt_term::update_background ()
1600	{	1672	{
1601	if (update_background_ev.is_active ())	1673	if (update_background_ev.is_active ())

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC vs. Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 2010 UTC