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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.293 by ayin, Fri Dec 28 14:57:04 2007 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-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2007 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.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	155	{
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
153	#if TRANSPARENT \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif	176	#endif
156	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
157	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
158	#endif	179	#endif
159	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
161	#endif
162	#ifdef TEXT_BLINK
163	text_blink_ev (this, &rxvt_term::text_blink_cb),
164	#endif
165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
167	#endif
168	#ifdef SELECTION_SCROLLING
169	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
170	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
173	#endif	182	#endif
174	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
175	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176	#endif	185	#endif
177	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),
179	#endif
180	#ifndef NO_BELL	186	#ifndef NO_BELL
181	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182	#endif	188	#endif
183	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190	incr_ev (this, &rxvt_term::incr_cb)	196
191	{
192	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193		198
194	termlist.push_back (this);	199	termlist.push_back (this);
195		200
196	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
198	#endif	203	#endif
199	}	204	}
200		205
201	// clean up the most important stuff, do not call x or free mem etc.	206	// clean up the most important stuff, do not call x or free mem etc.
202	// for use before an emergency exit	207	// for use before an emergency exit
		208	void
203	void rxvt_term::emergency_cleanup ()	209	rxvt_term::emergency_cleanup ()
204	{	210	{
205	if (cmd_pid)	211	if (cmd_pid)
206	kill (-cmd_pid, SIGHUP);	212	kill (-cmd_pid, SIGHUP);
207		213
208	pty_ev.stop ();	214	pty_ev.stop ();
…		…
270	}	276	}
271		277
272	clear ();	278	clear ();
273	}	279	}
274		280
275	delete [] pix_colors_focused;	281	#ifdef HAVE_BG_PIXMAP
276	#if OFF_FOCUS_FADING	282	bgPixmap.destroy ();
277	delete [] pix_colors_unfocused;
278	#endif	283	#endif
279		284	display->flush (); /* ideally .put should do this */
280	displays.put (display);	285	displays.put (display);
281		286
282	scr_release ();	287	scr_release ();
283		288
284	/* clear all resources */	289	/* clear all resources */
…		…
297	delete argv;	302	delete argv;
298		303
299	#ifdef KEYSYM_RESOURCE	304	#ifdef KEYSYM_RESOURCE
300	delete keyboard;	305	delete keyboard;
301	#endif	306	#endif
		307	#ifndef NO_RESOURCES
		308	XrmDestroyDatabase (option_db);
		309	#endif
302	}	310	}
303		311
304	// child has exited, usually destroys	312	// child has exited, usually destroys
305	void	313	void
306	rxvt_term::child_cb (child_watcher &w, int status)	314	rxvt_term::child_cb (ev::child &w, int status)
307	{	315	{
308	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	316	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309		317
310	cmd_pid = 0;	318	cmd_pid = 0;
311		319
312	if (!OPTION (Opt_hold))	320	if (!option (Opt_hold))
313	destroy ();	321	destroy ();
314	}	322	}
315		323
316	void	324	void
317	rxvt_term::destroy ()	325	rxvt_term::destroy ()
318	{	326	{
319	if (destroy_ev.active)	327	if (destroy_ev.is_active ())
320	return;	328	return;
321		329
322	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	330	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		331
324	#if ENABLE_OVERLAY	332	#if ENABLE_OVERLAY
…		…
331	im_ev.stop (display);	339	im_ev.stop (display);
332	#endif	340	#endif
333	#if HAVE_SCROLLBARS	341	#if HAVE_SCROLLBARS
334	scrollbar_ev.stop (display);	342	scrollbar_ev.stop (display);
335	#endif	343	#endif
336	#if TRANSPARENT \|\| ENABLE_PERL	344	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
337	rootwin_ev.stop (display);	345	rootwin_ev.stop (display);
338	#endif	346	#endif
339	incr_ev.stop ();	347	incr_ev.stop ();
340	termwin_ev.stop (display);	348	termwin_ev.stop (display);
341	vt_ev.stop (display);	349	vt_ev.stop (display);
342	}	350	}
343		351
344	check_ev.stop ();	352	flush_ev.stop ();
345	pty_ev.stop ();	353	pty_ev.stop ();
346	#ifdef CURSOR_BLINK	354	#ifdef CURSOR_BLINK
347	cursor_blink_ev.stop ();	355	cursor_blink_ev.stop ();
348	#endif	356	#endif
349	#ifdef TEXT_BLINK	357	#ifdef TEXT_BLINK
…		…
357	#endif	365	#endif
358	#ifdef POINTER_BLANK	366	#ifdef POINTER_BLANK
359	pointer_ev.stop ();	367	pointer_ev.stop ();
360	#endif	368	#endif
361		369
362	destroy_ev.start (0);	370	destroy_ev.start ();
363	}	371	}
364		372
365	void	373	void
366	rxvt_term::destroy_cb (time_watcher &w)	374	rxvt_term::destroy_cb (ev::idle &w, int revents)
367	{	375	{
368	make_current ();	376	make_current ();
369		377
370	delete this;	378	delete this;
371	}	379	}
…		…
425	else	433	else
426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	434	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427	mesg, BUFSIZ);	435	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429	}	437	}
430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	438	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431	mesg, BUFSIZ);	439	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433	}	441	}
434	#endif	442	#endif
435		443
…		…
460	rxvt_emergency_cleanup ();	468	rxvt_emergency_cleanup ();
461	_exit (EXIT_FAILURE);	469	_exit (EXIT_FAILURE);
462	}	470	}
463		471
464	/----------------------------------------------------------------------/	472	/----------------------------------------------------------------------/
465	bool	473	void
466	rxvt_term::init (int argc, const char const argv, stringvec *envv)	474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	475	{
468	this->envv = envv;	476	this->envv = envv;
469		477
470	SET_R (this);	478	SET_R (this);
471	set_locale ("");	479	set_locale ("");
472	set_environ (envv); // few things in X do not call setlocale :(	480	set_environ (envv); // few things in X do not call setlocale :(
473		481
474	if (!init_vars ())	482	init_vars ();
475	return false;
476		483
477	init_secondary ();	484	init_secondary ();
478		485
479	const char **cmd_argv = init_resources (argc, argv);	486	const char **cmd_argv = init_resources (argc, argv);
480		487
481	#ifdef KEYSYM_RESOURCE	488	#ifdef KEYSYM_RESOURCE
482	keyboard->register_done ();	489	keyboard->register_done ();
483	#endif	490	#endif
484		491
485	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
486	if (OPTION (Opt_scrollBar))	493	if (option (Opt_scrollBar))
487	scrollBar.setIdle (); /* set existence for size calculations */	494	scrollBar.setIdle (); /* set existence for size calculations */
488	#endif	495	#endif
489		496
490	pty = ptytty::create ();	497	pty = ptytty::create ();
491		498
…		…
498	#if 0	505	#if 0
499	XSynchronize (dpy, True);	506	XSynchronize (dpy, True);
500	#endif	507	#endif
501		508
502	#ifdef HAVE_SCROLLBARS	509	#ifdef HAVE_SCROLLBARS
503	if (OPTION (Opt_scrollBar))	510	if (option (Opt_scrollBar))
504	resize_scrollbar (); /* create and map scrollbar */	511	resize_scrollbar (); /* create and map scrollbar */
505	#endif	512	#endif
		513	#ifdef HAVE_BG_PIXMAP
		514	{
		515	bgPixmap.set_target (this);
		516
506	#ifdef TRANSPARENT	517	#ifdef ENABLE_TRANSPARENCY
507	if (OPTION (Opt_transparent))	518	if (option (Opt_transparent))
508	{	519	{
		520	bgPixmap.set_transparent ();
		521
		522	#ifdef HAVE_AFTERIMAGE
		523	if (rs [Rs_blurradius])
		524	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		525	#endif
		526	if (ISSET_PIXCOLOR (Color_tint))
		527	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		528
		529	if (rs [Rs_shade])
		530	bgPixmap.set_shade (rs [Rs_shade]);
		531
		532	bgPixmap.set_root_pixmap ();
509	XSelectInput (dpy, display->root, PropertyChangeMask);	533	XSelectInput (dpy, display->root, PropertyChangeMask);
510	check_our_parents ();
511	rootwin_ev.start (display, display->root);	534	rootwin_ev.start (display, display->root);
512	}	535	}
513	#endif	536	#endif
		537
		538	#ifdef BG_IMAGE_FROM_FILE
		539	if (rs[Rs_backgroundPixmap])
		540	{
		541	const char *p = rs[Rs_backgroundPixmap];
		542
		543	if ((p = strchr (p, ';')) != 0)
		544	{
		545	p++;
		546	bgPixmap.set_geometry (p);
		547	}
		548	else
		549	bgPixmap.set_defaultGeometry ();
		550
		551	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		552	if (!bgPixmap.window_position_sensitive ())
		553	update_background ();
		554	}
		555	#endif
		556	}
		557	#endif
		558
514	#if ENABLE_PERL	559	#if ENABLE_PERL
515	rootwin_ev.start (display, display->root);	560	rootwin_ev.start (display, display->root);
516	#endif	561	#endif
517		562
518	set_colorfgbg ();	563	set_colorfgbg ();
…		…
520	init_command (cmd_argv);	565	init_command (cmd_argv);
521		566
522	free (cmd_argv);	567	free (cmd_argv);
523		568
524	if (pty->pty >= 0)	569	if (pty->pty >= 0)
525	pty_ev.start (pty->pty, EVENT_READ);	570	pty_ev.start (pty->pty, ev::READ);
526
527	check_ev.start ();
528		571
529	HOOK_INVOKE ((this, HOOK_START, DT_END));	572	HOOK_INVOKE ((this, HOOK_START, DT_END));
530		573
531	#if ENABLE_XEMBED	574	#if ENABLE_XEMBED
532	if (rs[Rs_embed])	575	if (rs[Rs_embed])
…		…
538	}	581	}
539	#endif	582	#endif
540		583
541	XMapWindow (dpy, vt);	584	XMapWindow (dpy, vt);
542	XMapWindow (dpy, parent[0]);	585	XMapWindow (dpy, parent[0]);
543
544	return true;
545	}	586	}
546		587
547	static struct sig_handlers	588	static struct sig_handlers
548	{	589	{
549	sig_watcher sw_term, sw_int;	590	ev::sig sw_term, sw_int;
550		591
551	/*	592	/*
552	* Catch a fatal signal and tidy up before quitting	593	* Catch a fatal signal and tidy up before quitting
553	*/	594	*/
554	void	595	void sig_term (ev::sig &w, int revents);
555	sig_term (sig_watcher &w)	596
		597	sig_handlers ()
556	{	598	{
557	rxvt_emergency_cleanup ();	599	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
558	signal (w.signum, SIG_DFL);
559	kill (getpid (), w.signum);
560	}
561
562	sig_handlers ()
563	: sw_term (this, &sig_handlers::sig_term),
564	sw_int (this, &sig_handlers::sig_term)	600	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565	{
566	}	601	}
567	} sig_handlers;	602	} sig_handlers;
568		603
		604	void
		605	sig_handlers::sig_term (ev::sig &w, int revents)
		606	{
		607	rxvt_emergency_cleanup ();
		608	w.stop ();
		609	kill (getpid (), w.signum);
		610	}
		611
569	char **rxvt_environ; // startup environment	612	char **rxvt_environ; // startup environment
570		613
571	void	614	void
572	rxvt_init ()	615	rxvt_init ()
573	{	616	{
574	ptytty::init ();	617	ptytty::init ();
		618
		619	if (!ev_default_loop (0))
		620	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575		621
576	rxvt_environ = environ;	622	rxvt_environ = environ;
577		623
578	signal (SIGHUP, SIG_IGN);	624	signal (SIGHUP, SIG_IGN);
579	signal (SIGPIPE, SIG_IGN);	625	signal (SIGPIPE, SIG_IGN);
580		626
581	sig_handlers.sw_term.start (SIGTERM);	627	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582	sig_handlers.sw_int.start (SIGINT);	628	sig_handlers.sw_int.start (SIGINT); ev_unref ();
583		629
584	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	630	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
585	/* signal (SIGURG, SIG_DFL); */	631	/* signal (SIGURG, SIG_DFL); */
586		632
587	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	633	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
589	XSetIOErrorHandler (rxvt_xioerror_handler);	635	XSetIOErrorHandler (rxvt_xioerror_handler);
590		636
591	XrmInitialize ();	637	XrmInitialize ();
592	}	638	}
593		639
594	/* ------------------------------------------------------------------------- *
595	* MEMORY ALLOCATION WRAPPERS *
596	* ------------------------------------------------------------------------- */
597	void *
598	rxvt_malloc (size_t size)
599	{
600	void *p = malloc (size);
601
602	if (!p)
603	rxvt_fatal ("memory allocation failure. aborting.\n");
604
605	return p;
606	}
607
608	void *
609	rxvt_calloc (size_t number, size_t size)
610	{
611	void *p = calloc (number, size);
612
613	if (!p)
614	rxvt_fatal ("memory allocation failure. aborting.\n");
615
616	return p;
617	}
618
619	void *
620	rxvt_realloc (void *ptr, size_t size)
621	{
622	void *p = realloc (ptr, size);
623
624	if (!p)
625	rxvt_fatal ("memory allocation failure. aborting.\n");
626
627	return p;
628	}
629
630	/----------------------------------------------------------------------/	640	/----------------------------------------------------------------------/
631	/*	641	/*
632	* window size/position calculcations for XSizeHint and other storage.	642	* window size/position calculations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	643	* if width/height are non-zero then override calculated width/height
634	*/	644	*/
635	void	645	void
636	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	646	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	647	{
…		…
709	if (scrollBar.state)	719	if (scrollBar.state)
710	{	720	{
711	sb_w = scrollbar_TotalWidth ();	721	sb_w = scrollbar_TotalWidth ();
712	szHint.base_width += sb_w;	722	szHint.base_width += sb_w;
713		723
714	if (!OPTION (Opt_scrollBar_right))	724	if (!option (Opt_scrollBar_right))
715	window_vt_x += sb_w;	725	window_vt_x += sb_w;
716	}	726	}
717		727
718	szHint.width_inc = fwidth;	728	szHint.width_inc = fwidth;
719	szHint.height_inc = fheight;	729	szHint.height_inc = fheight;
…		…
740	{	750	{
741	min_it (height, max_height);	751	min_it (height, max_height);
742	szHint.height = szHint.base_height + height;	752	szHint.height = szHint.base_height + height;
743	}	753	}
744		754
745	if (scrollBar.state && OPTION (Opt_scrollBar_right))	755	if (scrollBar.state && option (Opt_scrollBar_right))
746	window_sb_x = szHint.width - sb_w;	756	window_sb_x = szHint.width - sb_w;
747		757
748	if (recalc_x)	758	if (recalc_x)
749	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	759	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750		760
…		…
773	ws.ws_xpixel = width;	783	ws.ws_xpixel = width;
774	ws.ws_ypixel = height;	784	ws.ws_ypixel = height;
775	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	785	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
776		786
777	#if 0	787	#if 0
778	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	788	// TIOCSWINSZ is supposed to do this automatically and correctly
779	if (cmd_pid) /* force through to the command */	789	if (cmd_pid) /* force through to the command */
780	kill (-cmd_pid, SIGWINCH);	790	kill (-cmd_pid, SIGWINCH);
781	#endif	791	#endif
782	}	792	}
783		793
…		…
812	delete fontset[0];	822	delete fontset[0];
813	fontset[0] = fs;	823	fontset[0] = fs;
814		824
815	prop = (*fs)[1]->properties ();	825	prop = (*fs)[1]->properties ();
816	prop.height += lineSpace;	826	prop.height += lineSpace;
		827
817	fs->set_prop (prop);	828	fs->set_prop (prop, false);
818		829
819	fwidth = prop.width;	830	fwidth = prop.width;
820	fheight = prop.height;	831	fheight = prop.height;
821	fbase = prop.ascent;	832	fbase = prop.ascent;
822		833
…		…
831	{	842	{
832	fontset[style] = fs = new rxvt_fontset (this);	843	fontset[style] = fs = new rxvt_fontset (this);
833	rxvt_fontprop prop2 = prop;	844	rxvt_fontprop prop2 = prop;
834		845
835	if (res)	846	if (res)
836	prop2.weight = prop2.slant = rxvt_fontprop::unset;	847	{
		848	fs->populate (res);
		849	fs->set_prop (prop2, false);
		850	}
837	else	851	else
838	{	852	{
839	res = fontset[0]->fontdesc;	853	fs->populate (fontset[0]->fontdesc);
840		854
841	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	855	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
842	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	856	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		857
		858	fs->set_prop (prop2, true);
843	}	859	}
844		860
845	fs->populate (res);
846	fs->set_prop (prop2);
847	}	861	}
848	#else	862	#else
849	fontset[style] = fontset[0];	863	fontset[style] = fontset[0];
850	#endif	864	#endif
851	}	865	}
…		…
853	if (parent[0])	867	if (parent[0])
854	{	868	{
855	resize_all_windows (0, 0, 0);	869	resize_all_windows (0, 0, 0);
856	scr_remap_chars ();	870	scr_remap_chars ();
857	scr_touch (true);	871	scr_touch (true);
858	}	872	}
859		873
860	return true;	874	return true;
861	}	875	}
862		876
		877	void
863	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	878	rxvt_term::set_string_property (Atom prop, const char *str, int len)
864	{	879	{
865	XChangeProperty (dpy, parent[0],	880	XChangeProperty (dpy, parent[0],
866	prop, XA_STRING, 8, PropModeReplace,	881	prop, XA_STRING, 8, PropModeReplace,
867	(const unsigned char *)str, len >= 0 ? len : strlen (str));	882	(const unsigned char *)str, len >= 0 ? len : strlen (str));
868	}	883	}
869		884
		885	void
870	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	886	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871	{	887	{
872	wchar_t *ws = rxvt_mbstowcs (str, len);	888	wchar_t *ws = rxvt_mbstowcs (str, len);
873	char *s = rxvt_wcstoutf8 (ws);	889	char *s = rxvt_wcstoutf8 (ws);
874		890
875	XChangeProperty (dpy, parent[0],	891	XChangeProperty (dpy, parent[0],
…		…
899	#if ENABLE_EWMH	915	#if ENABLE_EWMH
900	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	916	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901	#endif	917	#endif
902	}	918	}
903		919
		920	void
		921	rxvt_term::set_window_color (int idx, const char *color)
		922	{
904	#ifdef XTERM_COLOR_CHANGE	923	#ifdef XTERM_COLOR_CHANGE
905	void
906	rxvt_term::set_window_color (int idx, const char *color)
907	{
908	rxvt_color xcol;	924	rxvt_color xcol;
909	int i;	925	int i;
910		926
911	if (color == NULL \|\| *color == '\0')	927	if (color == NULL \|\| *color == '\0')
912	return;	928	return;
913		929
914	color = strdup (color);	930	color = strdup (color);
915	allocated.push_back ((void *)color);	931	allocated.push_back ((void *)color);
…		…
919	if (isdigit (*color))	935	if (isdigit (*color))
920	{	936	{
921	i = atoi (color);	937	i = atoi (color);
922		938
923	if (i >= 8 && i <= 15)	939	if (i >= 8 && i <= 15)
		940	{
924	{ /* bright colors */	941	/* bright colors */
925	i -= 8;
926	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	942	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
927	goto done;	943	goto done;
928	}	944	}
929		945
930	if (i >= 0 && i <= 7)	946	if (i >= 0 && i <= 7)
		947	{
931	{ /* normal colors */	948	/* normal colors */
932	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	949	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
933	goto done;	950	goto done;
934	}	951	}
935	}	952	}
936		953
…		…
941	* so just keep gobbling up the colormap	958	* so just keep gobbling up the colormap
942	*/	959	*/
943		960
944	pix_colors_focused[idx] = xcol;	961	pix_colors_focused[idx] = xcol;
945		962
946	/* XSetWindowAttributes attr; */
947	/* Cursor cursor; */
948	done:	963	done:
949	/TODO: handle Color_BD, scrollbar background, etc. /	964	/TODO: handle Color_BD, scrollbar background, etc. /
950		965
951	update_fade_color (idx);	966	update_fade_color (idx);
952	recolour_cursor ();	967	recolour_cursor ();
953	scr_recolour ();	968	scr_recolour ();
		969	#endif /* XTERM_COLOR_CHANGE */
954	}	970	}
955
956	#else
957	# define set_window_color (idx,color) ((void)0)
958	#endif /* XTERM_COLOR_CHANGE */
959		971
960	void	972	void
961	rxvt_term::recolour_cursor ()	973	rxvt_term::recolour_cursor ()
962	{	974	{
963	XColor fg, bg;	975	XColor fg, bg;
…		…
979	*/	991	*/
980	void	992	void
981	rxvt_term::set_colorfgbg ()	993	rxvt_term::set_colorfgbg ()
982	{	994	{
983	unsigned int i;	995	unsigned int i;
984	const char *xpmb = "\0";	996	const char *xpmb = "";
985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	997	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986		998
987	strcpy (fstr, "default");	999	strcpy (fstr, "default");
988	strcpy (bstr, "default");	1000	strcpy (bstr, "default");
989	for (i = Color_Black; i <= Color_White; i++)	1001	for (i = Color_Black; i <= Color_White; i++)
…		…
995		1007
996	for (i = Color_Black; i <= Color_White; i++)	1008	for (i = Color_Black; i <= Color_White; i++)
997	if (pix_colors[Color_bg] == pix_colors[i])	1009	if (pix_colors[Color_bg] == pix_colors[i])
998	{	1010	{
999	sprintf (bstr, "%d", (i - Color_Black));	1011	sprintf (bstr, "%d", (i - Color_Black));
1000	#ifdef XPM_BACKGROUND	1012	#ifdef BG_IMAGE_FROM_FILE
1001	xpmb = "default;";	1013	xpmb = "default;";
1002	#endif	1014	#endif
1003	break;	1015	break;
1004	}	1016	}
1005		1017
…		…
1101		1113
1102	XMoveResizeWindow (dpy, vt,	1114	XMoveResizeWindow (dpy, vt,
1103	window_vt_x, window_vt_y,	1115	window_vt_x, window_vt_y,
1104	width, height);	1116	width, height);
1105		1117
		1118	#ifdef HAVE_BG_PIXMAP
		1119	if (bgPixmap.window_size_sensitive ())
		1120	update_background ();
		1121	#endif
		1122
1106	scr_clear ();	1123	scr_clear ();
1107	#ifdef XPM_BACKGROUND
1108	resize_pixmap ();
1109	#endif
1110	}	1124	}
1111		1125
1112	if (fix_screen \|\| old_height == 0)	1126	if (fix_screen \|\| old_height == 0)
1113	scr_reset ();	1127	scr_reset ();
1114		1128
1115	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1129	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116	//scr_touch (false);	1130	//scr_touch (false);
1117		1131
1118	#ifdef XPM_BACKGROUND	1132	#ifdef HAVE_BG_PIXMAP
1119	if (pixmap)	1133	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1134	// if (bgPixmap.pixmap)
1120	scr_touch (false);	1135	// scr_touch (false);
1121	#endif	1136	#endif
1122		1137
1123	#ifdef USE_XIM	1138	#ifdef USE_XIM
1124	IMSetPosition ();	1139	IMSetPosition ();
1125	#endif	1140	#endif
…		…
1296	if (term->rs[Rs_imLocale])	1311	if (term->rs[Rs_imLocale])
1297	SET_LOCALE (term->locale);	1312	SET_LOCALE (term->locale);
1298	}	1313	}
1299	else	1314	else
1300	str = (void *)text->string.wide_char;	1315	str = (void *)text->string.wide_char;
1301		1316
1302	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1317	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303	DT_INT, call_data->caret,	1318	DT_INT, call_data->caret,
1304	DT_INT, call_data->chg_first,	1319	DT_INT, call_data->chg_first,
1305	DT_INT, call_data->chg_length,	1320	DT_INT, call_data->chg_length,
1306	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1321	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1625		1640
1626	if (input_style & XIMPreeditPosition)	1641	if (input_style & XIMPreeditPosition)
1627	{	1642	{
1628	im_set_size (preedit_rect);	1643	im_set_size (preedit_rect);
1629	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1644	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630		1645
1631	XSetICValues (Input_Context,	1646	XSetICValues (Input_Context,
1632	XNPreeditAttributes, preedit_attr, NULL);	1647	XNPreeditAttributes, preedit_attr, NULL);
1633	}	1648	}
1634	else	1649	else
1635	{	1650	{
…		…
1652	XFree (status_attr);	1667	XFree (status_attr);
1653	}	1668	}
1654		1669
1655	XFree (preedit_attr);	1670	XFree (preedit_attr);
1656	}	1671	}
1657	#endif /* USE_XIM */	1672	#endif /* USE_XIM */
		1673
		1674	void
		1675	rxvt_term::get_window_origin (int &x, int &y)
		1676	{
		1677	Window cr;
		1678	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1679	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1680	}
		1681
		1682	Pixmap
		1683	rxvt_term::get_pixmap_property (int prop_id)
		1684	{
		1685	if (prop_id > 0 && prop_id < NUM_XA)
		1686	if (xa[prop_id])
		1687	{
		1688	int aformat;
		1689	unsigned long nitems, bytes_after;
		1690	Atom atype;
		1691	unsigned char *prop = NULL;
		1692	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1693	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1694	&nitems, &bytes_after, &prop);
		1695	if (result == Success && prop && atype == XA_PIXMAP)
		1696	return (Pixmap )prop;
		1697	}
		1698
		1699	return None;
		1700	}
		1701
		1702	#ifdef HAVE_BG_PIXMAP
		1703	# if TRACE_PIXMAPS
		1704	# undef update_background
		1705	void
		1706	rxvt_term::trace_update_background (const char *file, int line)
		1707	{
		1708	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1709	update_background ();
		1710	}
		1711	# endif
		1712
		1713	void
		1714	rxvt_term::update_background ()
		1715	{
		1716	bgPixmap.invalidate ();
		1717
		1718	/* no chance of real time refresh if we are blurring! */
		1719	if (bgPixmap.invalid_since + 0.50 < ev::now ()
		1720	&& !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1721	{
		1722	update_background_ev.stop ();
		1723	bgPixmap.render ();
		1724	}
		1725	else
		1726	{
		1727	ev_tstamp refresh;
		1728
		1729	if (!bgPixmap.need_client_side_rendering ())
		1730	refresh = .05;
		1731	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1732	refresh = .20; /* very slow !!! */
		1733	else
		1734	refresh = .07;
		1735
		1736	update_background_ev.start (refresh);
		1737	}
		1738	}
		1739
		1740	void
		1741	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1742	{
		1743	make_current ();
		1744	bgPixmap.render ();
		1745	refresh_check ();
		1746	}
		1747
		1748	#endif /* HAVE_BG_PIXMAP */
1658		1749
1659	/----------------------- end-of-file (C source) -----------------------/	1750	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs. Revision 1.293 by ayin, Fri Dec 28 14:57:04 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.293 by ayin, Fri Dec 28 14:57:04 2007 UTC