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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC vs.
Revision 1.345 by root, Sat Jan 8 10:17:43 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);
…		…
226	if (fontset[i] != fontset[0])	225	if (fontset[i] != fontset[0])
227	delete fontset[i];	226	delete fontset[i];
228	#endif	227	#endif
229	delete fontset[0];	228	delete fontset[0];
230		229
		230	#ifdef HAVE_BG_PIXMAP
		231	bgPixmap.destroy ();
		232	#endif
		233	#ifdef HAVE_AFTERIMAGE
		234	if (asv)
		235	destroy_asvisual (asv, 0);
		236	if (asimman)
		237	destroy_image_manager (asimman, 0);
		238	#endif
		239
231	if (display)	240	if (display)
232	{	241	{
233	selection_clear ();	242	selection_clear ();
		243	selection_clear (true);
234		244
235	#ifdef USE_XIM	245	#ifdef USE_XIM
236	im_destroy ();	246	im_destroy ();
237	#endif	247	#endif
238	#ifdef XTERM_SCROLLBAR	248	scrollBar.destroy ();
239	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240	if (ShadowGC) XFreeGC (dpy, ShadowGC);
241	#endif
242	#ifdef PLAIN_SCROLLBAR
243	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244	#endif
245	#ifdef NEXT_SCROLLBAR
246	if (blackGC) XFreeGC (dpy, blackGC);
247	if (whiteGC) XFreeGC (dpy, whiteGC);
248	if (grayGC) XFreeGC (dpy, grayGC);
249	if (darkGC) XFreeGC (dpy, darkGC);
250	if (stippleGC) XFreeGC (dpy, stippleGC);
251	if (dimple) XFreePixmap (dpy, dimple);
252	if (upArrow) XFreePixmap (dpy, upArrow);
253	if (downArrow) XFreePixmap (dpy, downArrow);
254	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256	#endif
257	#ifdef RXVT_SCROLLBAR
258	if (topShadowGC) XFreeGC (dpy, topShadowGC);
259	if (botShadowGC) XFreeGC (dpy, botShadowGC);
260	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261	#endif
262	if (gc) XFreeGC (dpy, gc);	249	if (gc) XFreeGC (dpy, gc);
263		250
264	delete drawable;	251	delete drawable;
265	// destroy all windows	252	// destroy all windows
266	if (parent[0])	253	if (parent[0])
…		…
274	pix_colors_unfocused [i].free (this);	261	pix_colors_unfocused [i].free (this);
275	#endif	262	#endif
276	}	263	}
277		264
278	clear ();	265	clear ();
279	}
280		266
281	delete [] pix_colors_focused;
282	#if OFF_FOCUS_FADING
283	delete [] pix_colors_unfocused;
284	#endif
285
286	#ifdef HAVE_BG_PIXMAP
287	bgPixmap.destroy ();
288	#endif
289	display->flush (); /* ideally .put should do this */	267	display->flush (); /* ideally .put should do this */
290	displays.put (display);	268	displays.put (display);
		269	}
291		270
292	scr_release ();	271	scr_release ();
293		272
294	/* clear all resources */	273	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
296	free (allocated [i]);	275	free (allocated [i]);
297		276
298	free (selection.text);	277	free (selection.text);
		278	free (selection.clip_text);
299	// TODO: manage env vars in child only(!)	279	// TODO: manage env vars in child only(!)
300	free (env_display);	280	free (env_display);
301	free (env_term);	281	free (env_term);
302	free (locale);	282	free (locale);
303	free (v_buffer);	283	free (v_buffer);
…		…
341	if (display)	321	if (display)
342	{	322	{
343	#if USE_XIM	323	#if USE_XIM
344	im_ev.stop (display);	324	im_ev.stop (display);
345	#endif	325	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	326	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	328	rootwin_ev.stop (display);
351	#endif	329	#endif
352	incr_ev.stop ();	330	incr_ev.stop ();
353	termwin_ev.stop (display);	331	termwin_ev.stop (display);
…		…
379	rxvt_term::destroy_cb (ev::idle &w, int revents)	357	rxvt_term::destroy_cb (ev::idle &w, int revents)
380	{	358	{
381	make_current ();	359	make_current ();
382		360
383	delete this;	361	delete this;
		362	}
		363
		364	void
		365	rxvt_term::set_option (uint8_t opt, bool set)
		366	{
		367	if (!opt)
		368	return;
		369
		370	uint8_t mask = 1 << (opt & 7);
		371	uint8_t &val = options [opt >> 3];
		372
		373	val = val & ~mask \| (set ? mask : 0);
384	}	374	}
385		375
386	/----------------------------------------------------------------------/	376	/----------------------------------------------------------------------/
387	/*	377	/*
388	* Exit gracefully, clearing the utmp entry and restoring tty attributes	378	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
402	print_x_error (Display dpy, XErrorEvent event)	392	print_x_error (Display dpy, XErrorEvent event)
403	{	393	{
404	char buffer[BUFSIZ];	394	char buffer[BUFSIZ];
405	char mesg[BUFSIZ];	395	char mesg[BUFSIZ];
406	char number[32];	396	char number[32];
407	char *mtype = "XlibMessage";	397	const char mtype[] = "XlibMessage";
408	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	398	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	399	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410	rxvt_warn ("An X Error occured, trying to continue after report.\n");	400	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411	rxvt_warn ("%s: %s\n", mesg, buffer);	401	rxvt_warn ("%s: %s\n", mesg, buffer);
412	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	402	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414	sprintf(number, "%d", event->request_code);	404	sprintf(number, "%d", event->request_code);
415	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	405	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416	rxvt_warn ("(which is %s)\n", buffer);	406	rxvt_warn ("(which is %s)\n", buffer);
417	if (event->request_code >= 128) {	407	if (event->request_code >= 128) {
418	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	408	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419	mesg, BUFSIZ);	409	mesg, BUFSIZ);
420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421	}	411	}
422	if ((event->error_code == BadWindow) \|\|	412	if ((event->error_code == BadWindow) \|\|
423	(event->error_code == BadPixmap) \|\|	413	(event->error_code == BadPixmap) \|\|
424	(event->error_code == BadCursor) \|\|	414	(event->error_code == BadCursor) \|\|
425	(event->error_code == BadFont) \|\|	415	(event->error_code == BadFont) \|\|
426	(event->error_code == BadDrawable) \|\|	416	(event->error_code == BadDrawable) \|\|
427	(event->error_code == BadColor) \|\|	417	(event->error_code == BadColor) \|\|
428	(event->error_code == BadGC) \|\|	418	(event->error_code == BadGC) \|\|
429	(event->error_code == BadIDChoice) \|\|	419	(event->error_code == BadIDChoice) \|\|
430	(event->error_code == BadValue) \|\|	420	(event->error_code == BadValue) \|\|
431	(event->error_code == BadAtom)) {	421	(event->error_code == BadAtom)) {
432	if (event->error_code == BadValue)	422	if (event->error_code == BadValue)
433	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	423	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434	mesg, BUFSIZ);	424	mesg, BUFSIZ);
435	else if (event->error_code == BadAtom)	425	else if (event->error_code == BadAtom)
436	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	426	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437	mesg, BUFSIZ);	427	mesg, BUFSIZ);
438	else	428	else
439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440	mesg, BUFSIZ);	430	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442	}	432	}
443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444	mesg, BUFSIZ);	434	mesg, BUFSIZ);
445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446	}	436	}
447	#endif	437	#endif
448		438
449	int	439	int
…		…
472	DisplayString (display));	462	DisplayString (display));
473	rxvt_emergency_cleanup ();	463	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	464	_exit (EXIT_FAILURE);
475	}	465	}
476		466
477	/----------------------------------------------------------------------/
478	void
479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
480	{
481	this->envv = envv;
482
483	SET_R (this);
484	set_locale ("");
485	set_environ (envv); // few things in X do not call setlocale :(
486
487	init_vars ();
488
489	init_secondary ();
490
491	const char **cmd_argv = init_resources (argc, argv);
492
493	#ifdef KEYSYM_RESOURCE
494	keyboard->register_done ();
495	#endif
496
497	#ifdef HAVE_SCROLLBARS
498	if (option (Opt_scrollBar))
499	scrollBar.setIdle (); /* set existence for size calculations */
500	#endif
501
502	pty = ptytty::create ();
503
504	create_windows (argc, argv);
505
506	init_xlocale ();
507
508	scr_reset (); // initialize screen
509
510	#if 0
511	XSynchronize (dpy, True);
512	#endif
513
514	#ifdef HAVE_SCROLLBARS
515	if (option (Opt_scrollBar))
516	resize_scrollbar (); /* create and map scrollbar */
517	#endif
518	#ifdef HAVE_BG_PIXMAP
519	{
520	bgPixmap.set_target (this);
521
522	#ifdef ENABLE_TRANSPARENCY
523	if (option (Opt_transparent))
524	{
525	bgPixmap.set_transparent ();
526
527	#ifdef HAVE_AFTERIMAGE
528	if (rs [Rs_blurradius])
529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530	#endif
531	if (ISSET_PIXCOLOR (Color_tint))
532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
534	if (rs [Rs_shade])
535	bgPixmap.set_shade (rs [Rs_shade]);
536
537	bgPixmap.set_root_pixmap ();
538	XSelectInput (dpy, display->root, PropertyChangeMask);
539	rootwin_ev.start (display, display->root);
540	}
541	#endif
542
543	#ifdef BG_IMAGE_FROM_FILE
544	if (rs[Rs_backgroundPixmap])
545	{
546	const char *p = rs[Rs_backgroundPixmap];
547
548	if ((p = strchr (p, ';')) != 0)
549	{
550	p++;
551	bgPixmap.set_geometry (p);
552	}
553	else
554	bgPixmap.set_defaultGeometry ();
555
556	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557	if (!bgPixmap.window_position_sensitive ())
558	update_background ();
559	}
560	#endif
561	}
562	#endif
563
564	#if ENABLE_PERL
565	rootwin_ev.start (display, display->root);
566	#endif
567
568	set_colorfgbg ();
569
570	init_command (cmd_argv);
571
572	free (cmd_argv);
573
574	if (pty->pty >= 0)
575	pty_ev.start (pty->pty, ev::READ);
576
577	HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579	#if ENABLE_XEMBED
580	if (rs[Rs_embed])
581	{
582	long info[2] = { 0, XEMBED_MAPPED };
583
584	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585	32, PropModeReplace, (unsigned char *)&info, 2);
586	}
587	#endif
588
589	XMapWindow (dpy, vt);
590	XMapWindow (dpy, parent[0]);
591	}
592
593	static struct sig_handlers	467	static struct sig_handlers
594	{	468	{
595	ev::sig sw_term, sw_int;	469	ev::sig sw_term, sw_int;
596		470
597	/*	471	/*
…		…
612	rxvt_emergency_cleanup ();	486	rxvt_emergency_cleanup ();
613	w.stop ();	487	w.stop ();
614	kill (getpid (), w.signum);	488	kill (getpid (), w.signum);
615	}	489	}
616		490
		491	static void
		492	rxvt_get_ttymode (struct termios *tio)
		493	{
		494	if (tcgetattr (STDIN_FILENO, tio) < 0)
		495	memset (tio, 0, sizeof (struct termios));
		496
		497	for (int i = 0; i < NCCS; i++)
		498	tio->c_cc[i] = VDISABLE;
		499
		500	tio->c_cc[VINTR] = CINTR;
		501	tio->c_cc[VQUIT] = CQUIT;
		502	tio->c_cc[VERASE] = CERASE;
		503	#ifdef VERASE2
		504	tio->c_cc[VERASE2] = CERASE2;
		505	#endif
		506	tio->c_cc[VKILL] = CKILL;
		507	tio->c_cc[VEOF] = CEOF;
		508	tio->c_cc[VSTART] = CSTART;
		509	tio->c_cc[VSTOP] = CSTOP;
		510	tio->c_cc[VSUSP] = CSUSP;
		511	# ifdef VDSUSP
		512	tio->c_cc[VDSUSP] = CDSUSP;
		513	# endif
		514	# ifdef VREPRINT
		515	tio->c_cc[VREPRINT] = CRPRNT;
		516	# endif
		517	# ifdef VDISCRD
		518	tio->c_cc[VDISCRD] = CFLUSH;
		519	# endif
		520	# ifdef VWERSE
		521	tio->c_cc[VWERSE] = CWERASE;
		522	# endif
		523	# ifdef VLNEXT
		524	tio->c_cc[VLNEXT] = CLNEXT;
		525	# endif
		526	# ifdef VSTATUS
		527	tio->c_cc[VSTATUS] = CSTATUS;
		528	# endif
		529
		530	# if VMIN != VEOF
		531	tio->c_cc[VMIN] = 1;
		532	# endif
		533	# if VTIME != VEOL
		534	tio->c_cc[VTIME] = 0;
		535	# endif
		536
		537	/* input modes */
		538	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		539	# ifdef IMAXBEL
		540	\| IMAXBEL
		541	# endif
		542	\| IXON);
		543
		544	/* output modes */
		545	tio->c_oflag = (OPOST \| ONLCR);
		546
		547	/* control modes */
		548	tio->c_cflag = (CS8 \| CREAD);
		549
		550	/* local modes */
		551	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		552	# if defined (ECHOCTL) && defined (ECHOKE)
		553	\| ECHOCTL \| ECHOKE
		554	# endif
		555	\| ECHOE \| ECHOK);
		556	}
		557
617	char **rxvt_environ; // startup environment	558	char **rxvt_environ; // startup environment
618		559
619	void	560	void
620	rxvt_init ()	561	rxvt_init ()
621	{	562	{
622	ptytty::init ();	563	assert (("fontMask must not overlap other RS masks",
		564	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
623		565
		566	rxvt_get_ttymode (&rxvt_term::def_tio);
		567
		568	// get rid of stdin/stdout as we don't need them, to free resources
		569	dup2 (STDERR_FILENO, STDIN_FILENO);
		570	dup2 (STDERR_FILENO, STDOUT_FILENO);
		571
624	if (!ev_default_loop (0))	572	if (!ev_default_loop ())
625	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	573	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626		574
627	rxvt_environ = environ;	575	rxvt_environ = environ;
628		576
629	signal (SIGHUP, SIG_IGN);	577	signal (SIGHUP, SIG_IGN);
630	signal (SIGPIPE, SIG_IGN);	578	signal (SIGPIPE, SIG_IGN);
631		579
632	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	580	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633	sig_handlers.sw_int.start (SIGINT); ev_unref ();	581	sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
636	/* signal (SIGURG, SIG_DFL); */
637		582
638	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	583	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639	// TODO: handle this with exceptions and tolerate the memory loss	584	// TODO: handle this with exceptions and tolerate the memory loss
640	XSetIOErrorHandler (rxvt_xioerror_handler);	585	XSetIOErrorHandler (rxvt_xioerror_handler);
641		586
…		…
649	*/	594	*/
650	void	595	void
651	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	596	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
652	{	597	{
653	short recalc_x, recalc_y;	598	short recalc_x, recalc_y;
654	int x, y, sb_w, flags;	599	int x, y, flags;
655	unsigned int w, h;	600	unsigned int w, h;
656	unsigned int max_width, max_height;	601	unsigned int max_width, max_height;
657		602
658	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	603	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
659	szHint.win_gravity = NorthWestGravity;	604	szHint.win_gravity = NorthWestGravity;
…		…
669	if (rs[Rs_geometry])	614	if (rs[Rs_geometry])
670	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	615	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
671		616
672	if (flags & WidthValue)	617	if (flags & WidthValue)
673	{	618	{
		619	if (!w)
		620	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		621
674	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	622	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
675	szHint.flags \|= USSize;	623	szHint.flags \|= USSize;
676	}	624	}
677		625
678	if (flags & HeightValue)	626	if (flags & HeightValue)
679	{	627	{
		628	if (!h)
		629	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		630
680	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	631	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
681	szHint.flags \|= USSize;	632	szHint.flags \|= USSize;
682	}	633	}
683		634
684	if (flags & XValue)	635	if (flags & XValue)
685	{	636	{
…		…
716	max_width = MAX_COLS * fwidth;	667	max_width = MAX_COLS * fwidth;
717	max_height = MAX_ROWS * fheight;	668	max_height = MAX_ROWS * fheight;
718		669
719	szHint.base_width = szHint.base_height = 2 * int_bwidth;	670	szHint.base_width = szHint.base_height = 2 * int_bwidth;
720		671
721	sb_w = 0;
722	window_vt_x = window_vt_y = int_bwidth;	672	window_vt_x = window_vt_y = int_bwidth;
723		673
724	if (scrollBar.state)	674	if (scrollBar.state)
725	{	675	{
726	sb_w = scrollbar_TotalWidth ();	676	int sb_w = scrollBar.total_width ();
727	szHint.base_width += sb_w;	677	szHint.base_width += sb_w;
728		678
729	if (!option (Opt_scrollBar_right))	679	if (!option (Opt_scrollBar_right))
730	window_vt_x += sb_w;	680	window_vt_x += sb_w;
731	}	681	}
…		…
755	{	705	{
756	min_it (height, max_height);	706	min_it (height, max_height);
757	szHint.height = szHint.base_height + height;	707	szHint.height = szHint.base_height + height;
758	}	708	}
759		709
760	if (scrollBar.state && option (Opt_scrollBar_right))
761	window_sb_x = szHint.width - sb_w;
762
763	if (recalc_x)	710	if (recalc_x)
764	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	711	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
765		712
766	if (recalc_y)	713	if (recalc_y)
767	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	714	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
768		715
769	ncol = width / fwidth;	716	ncol = width / fwidth;
770	nrow = height / fheight;	717	nrow = height / fheight;
771	}	718	}
772		719
773	/----------------------------------------------------------------------/	720	/----------------------------------------------------------------------/
774	/*	721	/*
…		…
785		732
786	ws.ws_col = ncol;	733	ws.ws_col = ncol;
787	ws.ws_row = nrow;	734	ws.ws_row = nrow;
788	ws.ws_xpixel = width;	735	ws.ws_xpixel = width;
789	ws.ws_ypixel = height;	736	ws.ws_ypixel = height;
790	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	737	ioctl (pty->pty, TIOCSWINSZ, &ws);
791		738
792	#if 0	739	#if 0
793	// TIOCSWINSZ is supposed to do this automatically and correctly	740	// TIOCSWINSZ is supposed to do this automatically and correctly
794	if (cmd_pid) /* force through to the command */	741	if (cmd_pid) /* force through to the command */
795	kill (-cmd_pid, SIGWINCH);	742	kill (-cmd_pid, SIGWINCH);
…		…
825	#endif	772	#endif
826		773
827	delete fontset[0];	774	delete fontset[0];
828	fontset[0] = fs;	775	fontset[0] = fs;
829		776
830	prop = (*fs)[1]->properties ();	777	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
831	prop.height += lineSpace;	778	prop.height += lineSpace;
		779	prop.width += letterSpace;
832		780
833	fs->set_prop (prop, false);	781	fs->set_prop (prop, false);
834		782
835	fwidth = prop.width;	783	fwidth = prop.width;
836	fheight = prop.height;	784	fheight = prop.height;
…		…
886	prop, XA_STRING, 8, PropModeReplace,	834	prop, XA_STRING, 8, PropModeReplace,
887	(const unsigned char *)str, len >= 0 ? len : strlen (str));	835	(const unsigned char *)str, len >= 0 ? len : strlen (str));
888	}	836	}
889		837
890	void	838	void
		839	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		840	{
		841	XTextProperty ct;
		842
		843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		844	{
		845	XSetTextProperty (dpy, parent[0], &ct, prop);
		846	XFree (ct.value);
		847	}
		848	}
		849
		850	void
891	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
892	{	852	{
893	wchar_t *ws = rxvt_mbstowcs (str, len);	853	wchar_t *ws = rxvt_mbstowcs (str, len);
894	char *s = rxvt_wcstoutf8 (ws);	854	char *s = rxvt_wcstoutf8 (ws);
895		855
…		…
905	/----------------------------------------------------------------------/	865	/----------------------------------------------------------------------/
906	/* xterm sequences - title, iconName, color (exptl) */	866	/* xterm sequences - title, iconName, color (exptl) */
907	void	867	void
908	rxvt_term::set_title (const char *str)	868	rxvt_term::set_title (const char *str)
909	{	869	{
910	set_string_property (XA_WM_NAME, str);	870	set_mbstring_property (XA_WM_NAME, str);
911	#if ENABLE_EWMH	871	#if ENABLE_EWMH
912	set_utf8_property (xa[XA_NET_WM_NAME], str);	872	set_utf8_property (xa[XA_NET_WM_NAME], str);
913	#endif	873	#endif
914	}	874	}
915		875
916	void	876	void
917	rxvt_term::set_icon_name (const char *str)	877	rxvt_term::set_icon_name (const char *str)
918	{	878	{
919	set_string_property (XA_WM_ICON_NAME, str);	879	set_mbstring_property (XA_WM_ICON_NAME, str);
920	#if ENABLE_EWMH	880	#if ENABLE_EWMH
921	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	881	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
922	#endif	882	#endif
923	}	883	}
924		884
925	void	885	void
926	rxvt_term::set_window_color (int idx, const char *color)	886	rxvt_term::set_window_color (int idx, const char *color)
927	{	887	{
928	#ifdef XTERM_COLOR_CHANGE	888	#ifdef XTERM_COLOR_CHANGE
929	rxvt_color xcol;	889	rxvt_color xcol;
930	int i;
931		890
932	if (color == NULL \|\| *color == '\0')	891	if (color == NULL \|\| *color == '\0')
933	return;	892	return;
934		893
935	color = strdup (color);	894	color = strdup (color);
…		…
937	rs[Rs_color + idx] = color;	896	rs[Rs_color + idx] = color;
938		897
939	/* handle color aliases */	898	/* handle color aliases */
940	if (isdigit (*color))	899	if (isdigit (*color))
941	{	900	{
942	i = atoi (color);	901	int i = atoi (color);
943		902
944	if (i >= 8 && i <= 15)	903	if (i >= 8 && i <= 15)
945	{	904	{
946	/* bright colors */	905	/* bright colors */
947	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	906	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1004	strcpy (fstr, "default");	963	strcpy (fstr, "default");
1005	strcpy (bstr, "default");	964	strcpy (bstr, "default");
1006	for (i = Color_Black; i <= Color_White; i++)	965	for (i = Color_Black; i <= Color_White; i++)
1007	if (pix_colors[Color_fg] == pix_colors[i])	966	if (pix_colors[Color_fg] == pix_colors[i])
1008	{	967	{
1009	sprintf (fstr, "%d", (i - Color_Black));	968	sprintf (fstr, "%d", i - Color_Black);
1010	break;	969	break;
1011	}	970	}
1012		971
1013	for (i = Color_Black; i <= Color_White; i++)	972	for (i = Color_Black; i <= Color_White; i++)
1014	if (pix_colors[Color_bg] == pix_colors[i])	973	if (pix_colors[Color_bg] == pix_colors[i])
1015	{	974	{
1016	sprintf (bstr, "%d", (i - Color_Black));	975	sprintf (bstr, "%d", i - Color_Black);
1017	#ifdef BG_IMAGE_FROM_FILE	976	#ifdef BG_IMAGE_FROM_FILE
1018	xpmb = "default;";	977	xpmb = "default;";
1019	#endif	978	#endif
1020	break;	979	break;
1021	}	980	}
…		…
1051	int old_width = szHint.width;	1010	int old_width = szHint.width;
1052	int old_height = szHint.height;	1011	int old_height = szHint.height;
1053		1012
1054	window_calc (newwidth, newheight);	1013	window_calc (newwidth, newheight);
1055		1014
1056	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1015	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1016
		1017	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1018	if (set_hint)
		1019	{
		1020	szHint.flags &= ~(PBaseSize \| PResizeInc);
1057	XSetWMNormalHints (dpy, parent[0], &szHint);	1021	XSetWMNormalHints (dpy, parent[0], &szHint);
		1022	szHint.flags \|= PBaseSize \| PResizeInc;
		1023	}
1058		1024
1059	if (!ignoreparent)	1025	if (!ignoreparent)
1060	{	1026	{
1061	#ifdef SMART_RESIZE	1027	#ifdef SMART_RESIZE
1062	/*	1028	/*
…		…
1102	#else	1068	#else
1103	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1069	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1104	#endif	1070	#endif
1105	}	1071	}
1106		1072
		1073	if (set_hint)
		1074	XSetWMNormalHints (dpy, parent[0], &szHint);
		1075
1107	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1076	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1108		1077
1109	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1078	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1110	{	1079	{
1111	if (scrollBar.state)	1080	if (scrollBar.state)
1112	{	1081	scrollBar.resize ();
1113	XMoveResizeWindow (dpy, scrollBar.win,
1114	window_sb_x, 0,
1115	scrollbar_TotalWidth (), szHint.height);
1116	resize_scrollbar ();
1117	}
1118		1082
1119	XMoveResizeWindow (dpy, vt,	1083	XMoveResizeWindow (dpy, vt,
1120	window_vt_x, window_vt_y,	1084	window_vt_x, window_vt_y,
1121	width, height);	1085	width, height);
1122		1086
1123	#ifdef HAVE_BG_PIXMAP	1087	#ifdef HAVE_BG_PIXMAP
1124	if (bgPixmap.window_size_sensitive ())	1088	if (bgPixmap.window_size_sensitive ())
1125	update_background ();	1089	update_background ();
1126	#endif	1090	#endif
1127
1128	scr_clear ();
1129	}	1091	}
1130		1092
1131	if (fix_screen \|\| old_height == 0)	1093	if (fix_screen \|\| old_height == 0)
1132	scr_reset ();	1094	scr_reset ();
1133
1134	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1135	//scr_touch (false);
1136		1095
1137	#ifdef HAVE_BG_PIXMAP	1096	#ifdef HAVE_BG_PIXMAP
1138	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1097	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1139	// if (bgPixmap.pixmap)	1098	// if (bgPixmap.pixmap)
1140	// scr_touch (false);	1099	// scr_touch (false);
…		…
1212		1171
1213	/* Checking whether input method is running. */	1172	/* Checking whether input method is running. */
1214	bool	1173	bool
1215	rxvt_term::IMisRunning ()	1174	rxvt_term::IMisRunning ()
1216	{	1175	{
1217	char *p;
1218	Atom atom;	1176	Atom atom;
1219	Window win;	1177	Window win;
1220	char server[IMBUFSIZ];	1178	char server[IMBUFSIZ];
1221		1179
1222	/* get current locale modifier */	1180	/* get current locale modifier */
1223	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1181	if (char *p = XSetLocaleModifiers (0))
1224	{	1182	{
1225	strcpy (server, "@server=");	1183	strcpy (server, "@server=");
1226	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1184	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1227		1185
1228	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1186	if (p = strchr (server + 1, '@')) /* first one only */
1229	*p = '\0';	1187	*p = '\0';
1230		1188
1231	atom = XInternAtom (dpy, server, False);	1189	atom = XInternAtom (dpy, server, False);
1232	win = XGetSelectionOwner (dpy, atom);	1190	win = XGetSelectionOwner (dpy, atom);
1233		1191
…		…
1300		1258
1301	term->make_current ();	1259	term->make_current ();
1302		1260
1303	if (text)	1261	if (text)
1304	{	1262	{
1305	void *str;	1263	wchar_t *str;
1306		1264
1307	if (!text->encoding_is_wchar && text->string.multi_byte)	1265	if (!text->encoding_is_wchar && text->string.multi_byte)
1308	{	1266	{
1309	// of course, X makes it ugly again	1267	// of course, X makes it ugly again
1310	if (term->rs[Rs_imLocale])	1268	if (term->rs[Rs_imLocale])
1311	SET_LOCALE (term->rs[Rs_imLocale]);	1269	SET_LOCALE (term->rs[Rs_imLocale]);
1312		1270
1313	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1271	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1314	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1272	mbstowcs (str, text->string.multi_byte, text->length + 1);
1315		1273
1316	if (term->rs[Rs_imLocale])	1274	if (term->rs[Rs_imLocale])
1317	SET_LOCALE (term->locale);	1275	SET_LOCALE (term->locale);
1318	}	1276	}
1319	else	1277	else
1320	str = (void *)text->string.wide_char;	1278	str = text->string.wide_char;
1321		1279
1322	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1280	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1323	DT_INT, call_data->caret,	1281	DT_INT, call_data->caret,
1324	DT_INT, call_data->chg_first,	1282	DT_INT, call_data->chg_first,
1325	DT_INT, call_data->chg_length,	1283	DT_INT, call_data->chg_length,
…		…
1679	void	1637	void
1680	rxvt_term::get_window_origin (int &x, int &y)	1638	rxvt_term::get_window_origin (int &x, int &y)
1681	{	1639	{
1682	Window cr;	1640	Window cr;
1683	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1641	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1684	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1685	}	1642	}
1686		1643
1687	Pixmap	1644	Pixmap
1688	rxvt_term::get_pixmap_property (int prop_id)	1645	rxvt_term::get_pixmap_property (Atom property)
1689	{	1646	{
1690	if (prop_id > 0 && prop_id < NUM_XA)	1647	Pixmap pixmap = None;
1691	if (xa[prop_id])	1648
1692	{
1693	int aformat;	1649	int aformat;
1694	unsigned long nitems, bytes_after;	1650	unsigned long nitems, bytes_after;
1695	Atom atype;	1651	Atom atype;
1696	unsigned char *prop = NULL;	1652	unsigned char *prop;
1697	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1653	int result = XGetWindowProperty (dpy, display->root, property,
1698	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1654	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1699	&nitems, &bytes_after, &prop);	1655	&nitems, &bytes_after, &prop);
1700	if (result == Success && prop && atype == XA_PIXMAP)	1656	if (result == Success)
		1657	{
		1658	if (atype == XA_PIXMAP)
1701	return (Pixmap )prop;	1659	pixmap = (Pixmap )prop;
		1660	XFree (prop);
1702	}	1661	}
1703		1662
1704	return None;	1663	return pixmap;
1705	}	1664	}
1706		1665
1707	#ifdef HAVE_BG_PIXMAP	1666	#ifdef HAVE_BG_PIXMAP
1708	# if TRACE_PIXMAPS
1709	# undef update_background
1710	void
1711	rxvt_term::trace_update_background (const char *file, int line)
1712	{
1713	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1714	update_background ();
1715	}
1716	# endif
1717		1667
1718	void	1668	void
1719	rxvt_term::update_background ()	1669	rxvt_term::update_background ()
1720	{	1670	{
		1671	if (update_background_ev.is_active ())
		1672	return;
		1673
1721	bgPixmap.invalidate ();	1674	bgPixmap.invalidate ();
1722		1675
1723	/* no chance of real time refresh if we are blurring! */	1676	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1724	if (bgPixmap.invalid_since + 0.50 < ev::now ()	1677
1725	&& !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1678	if (to_wait <= 0.)
1726	{
1727	update_background_ev.stop ();
1728	bgPixmap.render ();	1679	bgPixmap.render ();
1729	}
1730	else	1680	else
1731	{
1732	ev_tstamp refresh;
1733
1734	if (!bgPixmap.need_client_side_rendering ())
1735	refresh = .05;
1736	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1737	refresh = .20; /* very slow !!! */
1738	else
1739	refresh = .07;
1740
1741	update_background_ev.start (refresh);	1681	update_background_ev.start (to_wait);
1742	}
1743	}	1682	}
1744		1683
1745	void	1684	void
1746	rxvt_term::update_background_cb (ev::timer &w, int revents)	1685	rxvt_term::update_background_cb (ev::timer &w, int revents)
1747	{	1686	{
1748	make_current ();	1687	make_current ();
		1688
		1689	update_background_ev.stop ();
1749	bgPixmap.render ();	1690	bgPixmap.render ();
1750	refresh_check ();	1691	refresh_check ();
1751	}	1692	}
1752		1693
1753	#endif /* HAVE_BG_PIXMAP */	1694	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC vs. Revision 1.345 by root, Sat Jan 8 10:17:43 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC vs.
Revision 1.345 by root, Sat Jan 8 10:17:43 2011 UTC