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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.219 by root, Sat Feb 11 02:28:19 2006 UTC vs.
Revision 1.296 by sasha, Fri Jan 4 21:25:57 2008 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
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"
…		…
56	static char curlocale[128], savelocale[128];	59	static char curlocale[128], savelocale[128];
57		60
58	bool	61	bool
59	rxvt_set_locale (const char *locale) NOTHROW	62	rxvt_set_locale (const char *locale) NOTHROW
60	{	63	{
		64	int size = strlen (locale) + 1;
		65
		66	if (size > sizeof (curlocale))
		67	rxvt_fatal ("locale string too long, aborting.\n");
		68
61	if (!locale \|\| !strncmp (locale, curlocale, 128))	69	if (!locale \|\| !memcmp (locale, curlocale, size))
62	return false;	70	return false;
63		71
64	strncpy (curlocale, locale, 128);	72	memcpy (curlocale, locale, size);
65	setlocale (LC_CTYPE, curlocale);	73	setlocale (LC_CTYPE, curlocale);
66	return true;	74	return true;
67	}	75	}
68		76
69	void	77	void
…		…
83	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
84		92
85	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)
86	{	94	{
87	compose_char *cc;	95	compose_char *cc;
88		96
89	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
90	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
91	cc = (*this)[c1];	99	cc = (*this)[c1];
92	while (cc)	100	while (cc)
93	{	101	{
…		…
142		150
143	}	151	}
144	#endif	152	#endif
145		153
146	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
147	:	155	{
148	#if TRANSPARENT	156	#if HAVE_BG_PIXMAP
149	rootwin_ev (this, &rxvt_term::rootwin_cb),	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
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
150	#endif	176	#endif
151	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
152	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153	#endif	179	#endif
154	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162	#endif
163	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168	#endif	182	#endif
169	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171	#endif	185	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	#ifndef NO_BELL	186	#ifndef NO_BELL
176	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177	#endif	188	#endif
178	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185	incr_ev (this, &rxvt_term::incr_cb)	196
186	{
187	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188		198
189	termlist.push_back (this);	199	termlist.push_back (this);
190		200
191	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
193	#endif	203	#endif
194	}	204	}
195		205
196	// 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.
197	// for use before an emergency exit	207	// for use before an emergency exit
		208	void
198	void rxvt_term::emergency_cleanup ()	209	rxvt_term::emergency_cleanup ()
199	{	210	{
200	if (cmd_pid)	211	if (cmd_pid)
201	kill (-cmd_pid, SIGHUP);	212	kill (-cmd_pid, SIGHUP);
202		213
		214	pty_ev.stop ();
203	delete pty; pty = 0;	215	delete pty; pty = 0;
204	}	216	}
205		217
206	rxvt_term::~rxvt_term ()	218	rxvt_term::~rxvt_term ()
207	{	219	{
…		…
264	}	276	}
265		277
266	clear ();	278	clear ();
267	}	279	}
268		280
269	delete pix_colors_focused;	281	#ifdef HAVE_BG_PIXMAP
270	#if OFF_FOCUS_FADING	282	bgPixmap.destroy ();
271	delete pix_colors_unfocused;
272	#endif	283	#endif
273		284	display->flush (); /* ideally .put should do this */
274	displays.put (display);	285	displays.put (display);
275		286
276	scr_release ();	287	scr_release ();
277		288
278	/* clear all resources */	289	/* clear all resources */
…		…
291	delete argv;	302	delete argv;
292		303
293	#ifdef KEYSYM_RESOURCE	304	#ifdef KEYSYM_RESOURCE
294	delete keyboard;	305	delete keyboard;
295	#endif	306	#endif
		307	#ifndef NO_RESOURCES
		308	XrmDestroyDatabase (option_db);
		309	#endif
296	}	310	}
297		311
298	// child has exited, usually destroys	312	// child has exited, usually destroys
299	void	313	void
300	rxvt_term::child_cb (child_watcher &w, int status)	314	rxvt_term::child_cb (ev::child &w, int status)
301	{	315	{
302	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	316	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303		317
304	cmd_pid = 0;	318	cmd_pid = 0;
305		319
306	if (!OPTION (Opt_hold))	320	if (!option (Opt_hold))
307	destroy ();	321	destroy ();
308	}	322	}
309		323
310	void	324	void
311	rxvt_term::destroy ()	325	rxvt_term::destroy ()
312	{	326	{
313	if (destroy_ev.active)	327	if (destroy_ev.is_active ())
314	return;	328	return;
315		329
316	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	330	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317		331
318	#if ENABLE_OVERLAY	332	#if ENABLE_OVERLAY
…		…
325	im_ev.stop (display);	339	im_ev.stop (display);
326	#endif	340	#endif
327	#if HAVE_SCROLLBARS	341	#if HAVE_SCROLLBARS
328	scrollbar_ev.stop (display);	342	scrollbar_ev.stop (display);
329	#endif	343	#endif
330	#if TRANSPARENT	344	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
331	rootwin_ev.stop (display);	345	rootwin_ev.stop (display);
332	#endif	346	#endif
333	incr_ev.stop ();	347	incr_ev.stop ();
334	termwin_ev.stop (display);	348	termwin_ev.stop (display);
335	vt_ev.stop (display);	349	vt_ev.stop (display);
336	}	350	}
337		351
338	check_ev.stop ();	352	flush_ev.stop ();
339	pty_ev.stop ();	353	pty_ev.stop ();
340	#ifdef CURSOR_BLINK	354	#ifdef CURSOR_BLINK
341	cursor_blink_ev.stop ();	355	cursor_blink_ev.stop ();
342	#endif	356	#endif
343	#ifdef TEXT_BLINK	357	#ifdef TEXT_BLINK
…		…
351	#endif	365	#endif
352	#ifdef POINTER_BLANK	366	#ifdef POINTER_BLANK
353	pointer_ev.stop ();	367	pointer_ev.stop ();
354	#endif	368	#endif
355		369
356	destroy_ev.start (0);	370	destroy_ev.start ();
357	}	371	}
358		372
359	void	373	void
360	rxvt_term::destroy_cb (time_watcher &w)	374	rxvt_term::destroy_cb (ev::idle &w, int revents)
361	{	375	{
362	make_current ();	376	make_current ();
363		377
364	delete this;	378	delete this;
365	}	379	}
…		…
419	else	433	else
420	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	434	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421	mesg, BUFSIZ);	435	mesg, BUFSIZ);
422	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423	}	437	}
424	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	438	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425	mesg, BUFSIZ);	439	mesg, BUFSIZ);
426	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427	}	441	}
428	#endif	442	#endif
429		443
…		…
454	rxvt_emergency_cleanup ();	468	rxvt_emergency_cleanup ();
455	_exit (EXIT_FAILURE);	469	_exit (EXIT_FAILURE);
456	}	470	}
457		471
458	/----------------------------------------------------------------------/	472	/----------------------------------------------------------------------/
459	bool	473	void
460	rxvt_term::init (int argc, const char const argv, stringvec *envv)	474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
461	{	475	{
462	this->envv = envv;	476	this->envv = envv;
463		477
464	SET_R (this);	478	SET_R (this);
465	set_locale ("");	479	set_locale ("");
466	set_environ (envv); // few things in X do not call setlocale :(	480	set_environ (envv); // few things in X do not call setlocale :(
467		481
468	if (!init_vars ())	482	init_vars ();
469	return false;
470		483
471	init_secondary ();	484	init_secondary ();
472		485
473	const char **cmd_argv = init_resources (argc, argv);	486	const char **cmd_argv = init_resources (argc, argv);
474		487
475	#ifdef KEYSYM_RESOURCE	488	#ifdef KEYSYM_RESOURCE
476	keyboard->register_done ();	489	keyboard->register_done ();
477	#endif	490	#endif
478		491
479	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
480	if (OPTION (Opt_scrollBar))	493	if (option (Opt_scrollBar))
481	scrollBar.setIdle (); /* set existence for size calculations */	494	scrollBar.setIdle (); /* set existence for size calculations */
482	#endif	495	#endif
483		496
484	pty = ptytty::create ();	497	pty = ptytty::create ();
485		498
…		…
492	#if 0	505	#if 0
493	XSynchronize (dpy, True);	506	XSynchronize (dpy, True);
494	#endif	507	#endif
495		508
496	#ifdef HAVE_SCROLLBARS	509	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))	510	if (option (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */	511	resize_scrollbar (); /* create and map scrollbar */
499	#endif	512	#endif
		513	#ifdef HAVE_BG_PIXMAP
		514	{
		515	bgPixmap.set_target (this);
		516
500	#ifdef TRANSPARENT	517	#ifdef ENABLE_TRANSPARENCY
501	if (OPTION (Opt_transparent))	518	if (option (Opt_transparent))
502	{	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 ();
503	XSelectInput (dpy, display->root, PropertyChangeMask);	533	XSelectInput (dpy, display->root, PropertyChangeMask);
504	check_our_parents ();
505	rootwin_ev.start (display, display->root);	534	rootwin_ev.start (display, display->root);
506	}	535	}
		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
		559	#if ENABLE_PERL
		560	rootwin_ev.start (display, display->root);
507	#endif	561	#endif
508		562
509	set_colorfgbg ();	563	set_colorfgbg ();
510		564
511	init_command (cmd_argv);	565	init_command (cmd_argv);
512		566
513	free (cmd_argv);	567	free (cmd_argv);
514		568
515	if (pty->pty >= 0)	569	if (pty->pty >= 0)
516	pty_ev.start (pty->pty, EVENT_READ);	570	pty_ev.start (pty->pty, ev::READ);
517
518	check_ev.start ();
519		571
520	HOOK_INVOKE ((this, HOOK_START, DT_END));	572	HOOK_INVOKE ((this, HOOK_START, DT_END));
521		573
522	#if ENABLE_XEMBED	574	#if ENABLE_XEMBED
523	if (rs[Rs_embed])	575	if (rs[Rs_embed])
…		…
529	}	581	}
530	#endif	582	#endif
531		583
532	XMapWindow (dpy, vt);	584	XMapWindow (dpy, vt);
533	XMapWindow (dpy, parent[0]);	585	XMapWindow (dpy, parent[0]);
534
535	return true;
536	}	586	}
537		587
538	static struct sig_handlers	588	static struct sig_handlers
539	{	589	{
540	sig_watcher sw_term, sw_int;	590	ev::sig sw_term, sw_int;
541		591
542	/*	592	/*
543	* Catch a fatal signal and tidy up before quitting	593	* Catch a fatal signal and tidy up before quitting
544	*/	594	*/
545	void	595	void sig_term (ev::sig &w, int revents);
546	sig_term (sig_watcher &w)	596
		597	sig_handlers ()
547	{	598	{
548	rxvt_emergency_cleanup ();	599	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
549	signal (w.signum, SIG_DFL);
550	kill (getpid (), w.signum);
551	}
552
553	sig_handlers ()
554	: sw_term (this, &sig_handlers::sig_term),
555	sw_int (this, &sig_handlers::sig_term)	600	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
556	{
557	}	601	}
558	} sig_handlers;	602	} sig_handlers;
559		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
560	char **rxvt_environ; // startup environment	612	char **rxvt_environ; // startup environment
561		613
562	void	614	void
563	rxvt_init ()	615	rxvt_init ()
564	{	616	{
565	ptytty::init ();	617	ptytty::init ();
		618
		619	if (!ev_default_loop (0))
		620	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
566		621
567	rxvt_environ = environ;	622	rxvt_environ = environ;
568		623
569	signal (SIGHUP, SIG_IGN);	624	signal (SIGHUP, SIG_IGN);
570	signal (SIGPIPE, SIG_IGN);	625	signal (SIGPIPE, SIG_IGN);
571		626
572	sig_handlers.sw_term.start (SIGTERM);	627	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
573	sig_handlers.sw_int.start (SIGINT);	628	sig_handlers.sw_int.start (SIGINT); ev_unref ();
574		629
575	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	630	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
576	/* signal (SIGURG, SIG_DFL); */	631	/* signal (SIGURG, SIG_DFL); */
577		632
578	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	633	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
580	XSetIOErrorHandler (rxvt_xioerror_handler);	635	XSetIOErrorHandler (rxvt_xioerror_handler);
581		636
582	XrmInitialize ();	637	XrmInitialize ();
583	}	638	}
584		639
585	/* ------------------------------------------------------------------------- *
586	* MEMORY ALLOCATION WRAPPERS *
587	* ------------------------------------------------------------------------- */
588	void *
589	rxvt_malloc (size_t size)
590	{
591	void *p = malloc (size);
592
593	if (!p)
594	rxvt_fatal ("memory allocation failure. aborting.\n");
595
596	return p;
597	}
598
599	void *
600	rxvt_calloc (size_t number, size_t size)
601	{
602	void *p = calloc (number, size);
603
604	if (!p)
605	rxvt_fatal ("memory allocation failure. aborting.\n");
606
607	return p;
608	}
609
610	void *
611	rxvt_realloc (void *ptr, size_t size)
612	{
613	void *p = realloc (ptr, size);
614
615	if (!p)
616	rxvt_fatal ("memory allocation failure. aborting.\n");
617
618	return p;
619	}
620
621	/----------------------------------------------------------------------/	640	/----------------------------------------------------------------------/
622	/*	641	/*
623	* window size/position calculcations for XSizeHint and other storage.	642	* window size/position calculations for XSizeHint and other storage.
624	* if width/height are non-zero then override calculated width/height	643	* if width/height are non-zero then override calculated width/height
625	*/	644	*/
626	void	645	void
627	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	646	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628	{	647	{
…		…
700	if (scrollBar.state)	719	if (scrollBar.state)
701	{	720	{
702	sb_w = scrollbar_TotalWidth ();	721	sb_w = scrollbar_TotalWidth ();
703	szHint.base_width += sb_w;	722	szHint.base_width += sb_w;
704		723
705	if (!OPTION (Opt_scrollBar_right))	724	if (!option (Opt_scrollBar_right))
706	window_vt_x += sb_w;	725	window_vt_x += sb_w;
707	}	726	}
708		727
709	szHint.width_inc = fwidth;	728	szHint.width_inc = fwidth;
710	szHint.height_inc = fheight;	729	szHint.height_inc = fheight;
…		…
731	{	750	{
732	min_it (height, max_height);	751	min_it (height, max_height);
733	szHint.height = szHint.base_height + height;	752	szHint.height = szHint.base_height + height;
734	}	753	}
735		754
736	if (scrollBar.state && OPTION (Opt_scrollBar_right))	755	if (scrollBar.state && option (Opt_scrollBar_right))
737	window_sb_x = szHint.width - sb_w;	756	window_sb_x = szHint.width - sb_w;
738		757
739	if (recalc_x)	758	if (recalc_x)
740	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	759	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741		760
…		…
764	ws.ws_xpixel = width;	783	ws.ws_xpixel = width;
765	ws.ws_ypixel = height;	784	ws.ws_ypixel = height;
766	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	785	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
767		786
768	#if 0	787	#if 0
769	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	788	// TIOCSWINSZ is supposed to do this automatically and correctly
770	if (cmd_pid) /* force through to the command */	789	if (cmd_pid) /* force through to the command */
771	kill (-cmd_pid, SIGWINCH);	790	kill (-cmd_pid, SIGWINCH);
772	#endif	791	#endif
773	}	792	}
774		793
…		…
803	delete fontset[0];	822	delete fontset[0];
804	fontset[0] = fs;	823	fontset[0] = fs;
805		824
806	prop = (*fs)[1]->properties ();	825	prop = (*fs)[1]->properties ();
807	prop.height += lineSpace;	826	prop.height += lineSpace;
		827
808	fs->set_prop (prop);	828	fs->set_prop (prop, false);
809		829
810	fwidth = prop.width;	830	fwidth = prop.width;
811	fheight = prop.height;	831	fheight = prop.height;
812	fbase = prop.ascent;	832	fbase = prop.ascent;
813		833
…		…
822	{	842	{
823	fontset[style] = fs = new rxvt_fontset (this);	843	fontset[style] = fs = new rxvt_fontset (this);
824	rxvt_fontprop prop2 = prop;	844	rxvt_fontprop prop2 = prop;
825		845
826	if (res)	846	if (res)
827	prop2.weight = prop2.slant = rxvt_fontprop::unset;	847	{
		848	fs->populate (res);
		849	fs->set_prop (prop2, false);
		850	}
828	else	851	else
829	{	852	{
830	res = fontset[0]->fontdesc;	853	fs->populate (fontset[0]->fontdesc);
831		854
832	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;
833	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);
834	}	859	}
835		860
836	fs->populate (res);
837	fs->set_prop (prop2);
838	}	861	}
839	#else	862	#else
840	fontset[style] = fontset[0];	863	fontset[style] = fontset[0];
841	#endif	864	#endif
842	}	865	}
…		…
844	if (parent[0])	867	if (parent[0])
845	{	868	{
846	resize_all_windows (0, 0, 0);	869	resize_all_windows (0, 0, 0);
847	scr_remap_chars ();	870	scr_remap_chars ();
848	scr_touch (true);	871	scr_touch (true);
849	}	872	}
850		873
851	return true;	874	return true;
852	}	875	}
853		876
		877	void
854	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)
855	{	879	{
856	XChangeProperty (dpy, parent[0],	880	XChangeProperty (dpy, parent[0],
857	prop, XA_STRING, 8, PropModeReplace,	881	prop, XA_STRING, 8, PropModeReplace,
858	(const unsigned char *)str, len >= 0 ? len : strlen (str));	882	(const unsigned char *)str, len >= 0 ? len : strlen (str));
859	}	883	}
860		884
		885	void
861	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)
862	{	887	{
863	wchar_t *ws = rxvt_mbstowcs (str, len);	888	wchar_t *ws = rxvt_mbstowcs (str, len);
864	char *s = rxvt_wcstoutf8 (ws);	889	char *s = rxvt_wcstoutf8 (ws);
865		890
866	XChangeProperty (dpy, parent[0],	891	XChangeProperty (dpy, parent[0],
…		…
890	#if ENABLE_EWMH	915	#if ENABLE_EWMH
891	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	916	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892	#endif	917	#endif
893	}	918	}
894		919
		920	void
		921	rxvt_term::set_window_color (int idx, const char *color)
		922	{
895	#ifdef XTERM_COLOR_CHANGE	923	#ifdef XTERM_COLOR_CHANGE
896	void
897	rxvt_term::set_window_color (int idx, const char *color)
898	{
899	rxvt_color xcol;	924	rxvt_color xcol;
900	int i;	925	int i;
901		926
902	if (color == NULL \|\| *color == '\0')	927	if (color == NULL \|\| *color == '\0')
903	return;	928	return;
904		929
905	color = strdup (color);	930	color = strdup (color);
906	allocated.push_back ((void *)color);	931	allocated.push_back ((void *)color);
…		…
910	if (isdigit (*color))	935	if (isdigit (*color))
911	{	936	{
912	i = atoi (color);	937	i = atoi (color);
913		938
914	if (i >= 8 && i <= 15)	939	if (i >= 8 && i <= 15)
		940	{
915	{ /* bright colors */	941	/* bright colors */
916	i -= 8;
917	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	942	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
918	goto done;	943	goto done;
919	}	944	}
920		945
921	if (i >= 0 && i <= 7)	946	if (i >= 0 && i <= 7)
		947	{
922	{ /* normal colors */	948	/* normal colors */
923	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	949	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
924	goto done;	950	goto done;
925	}	951	}
926	}	952	}
927		953
…		…
932	* so just keep gobbling up the colormap	958	* so just keep gobbling up the colormap
933	*/	959	*/
934		960
935	pix_colors_focused[idx] = xcol;	961	pix_colors_focused[idx] = xcol;
936		962
937	/* XSetWindowAttributes attr; */
938	/* Cursor cursor; */
939	done:	963	done:
940
941	#if OFF_FOCUS_FADING
942	if (rs[Rs_fade])
943	{
944	rgba c;
945	pix_colors [Color_fade].get (c);
946	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947	}
948	#endif
949
950	/TODO: handle Color_BD, scrollbar background, etc. /	964	/TODO: handle Color_BD, scrollbar background, etc. /
951		965
		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	IMSetStatusPosition ();	1139	IMSetPosition ();
1125	#endif	1140	#endif
1126	}	1141	}
1127		1142
1128	/*	1143	/*
1129	* Set the width/height of the vt window in characters. Units are pixels.	1144	* Set the width/height of the vt window in characters. Units are pixels.
…		…
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,
…		…
1526	preedit_attr,	1541	preedit_attr,
1527	status_attr ? XNStatusAttributes : NULL,	1542	status_attr ? XNStatusAttributes : NULL,
1528	status_attr, NULL);	1543	status_attr, NULL);
1529		1544
1530	if (preedit_attr) XFree (preedit_attr);	1545	if (preedit_attr) XFree (preedit_attr);
1531	if (status_attr) XFree (status_attr);	1546	if (status_attr) XFree (status_attr);
1532	if (fs) XFreeFontSet (dpy, fs);	1547	if (fs) XFreeFontSet (dpy, fs);
1533		1548
1534	if (Input_Context == NULL)	1549	if (Input_Context == NULL)
1535	{	1550	{
1536	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1551	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1537	im_destroy ();	1552	im_destroy ();
…		…
1542	// unfortunately, only the focus window is used by XIM, hard to fix	1557	// unfortunately, only the focus window is used by XIM, hard to fix
1543	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1558	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544	vt_select_input ();	1559	vt_select_input ();
1545	#endif	1560	#endif
1546		1561
1547	if (input_style & XIMPreeditArea)
1548	IMSetStatusPosition ();	1562	IMSetPosition ();
1549		1563
1550	return true;	1564	return true;
1551	}	1565	}
1552		1566
1553	void	1567	void
…		…
1611	SET_LOCALE (locale);	1625	SET_LOCALE (locale);
1612	#endif	1626	#endif
1613	}	1627	}
1614		1628
1615	void	1629	void
1616	rxvt_term::IMSetStatusPosition ()	1630	rxvt_term::IMSetPosition ()
1617	{	1631	{
1618	XRectangle preedit_rect, status_rect, *needed_rect;	1632	XRectangle preedit_rect, status_rect, *needed_rect;
1619	XVaNestedList preedit_attr, status_attr;	1633	XVaNestedList preedit_attr, status_attr;
1620		1634
1621	if (!Input_Context	1635	if (!Input_Context
1622	\|\| !focus	1636	\|\| !focus
1623	\|\| !(input_style & XIMPreeditArea)	1637	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1624	\|\| !IMisRunning ())	1638	\|\| !IMisRunning ())
1625	return;	1639	return;
1626		1640
		1641	if (input_style & XIMPreeditPosition)
		1642	{
		1643	im_set_size (preedit_rect);
		1644	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1645
		1646	XSetICValues (Input_Context,
		1647	XNPreeditAttributes, preedit_attr, NULL);
		1648	}
		1649	else
		1650	{
1627	/* Getting the necessary width of preedit area */	1651	/* Getting the necessary width of preedit area */
1628	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1652	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1629	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1653	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1630	XFree (status_attr);	1654	XFree (status_attr);
1631		1655
1632	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1656	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1633	XFree (needed_rect);	1657	XFree (needed_rect);
1634		1658
1635	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1659	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1636	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1660	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1637		1661
1638	XSetICValues (Input_Context,	1662	XSetICValues (Input_Context,
1639	XNPreeditAttributes, preedit_attr,	1663	XNPreeditAttributes, preedit_attr,
1640	XNStatusAttributes, status_attr, NULL);	1664	XNStatusAttributes, status_attr,
		1665	NULL);
1641		1666
		1667	XFree (status_attr);
		1668	}
		1669
1642	XFree (preedit_attr);	1670	XFree (preedit_attr);
1643	XFree (status_attr);
1644	}	1671	}
1645	#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	if (update_background_ev.is_active ())
		1717	return;
		1718
		1719	bgPixmap.invalidate ();
		1720
		1721	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1722
		1723	if ( to_wait <= 0. )
		1724	bgPixmap.render ();
		1725	else
		1726	update_background_ev.start (to_wait);
		1727	}
		1728
		1729	void
		1730	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1731	{
		1732	make_current ();
		1733
		1734	update_background_ev.stop ();
		1735	bgPixmap.render ();
		1736	refresh_check ();
		1737	}
		1738
		1739	#endif /* HAVE_BG_PIXMAP */
1646		1740
1647	/----------------------- end-of-file (C source) -----------------------/	1741	/----------------------- 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.219 by root, Sat Feb 11 02:28:19 2006 UTC vs. Revision 1.296 by sasha, Fri Jan 4 21:25:57 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.219 by root, Sat Feb 11 02:28:19 2006 UTC vs.
Revision 1.296 by sasha, Fri Jan 4 21:25:57 2008 UTC