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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.222 by root, Sun Feb 12 09:44:04 2006 UTC vs.
Revision 1.300 by root, Sat Jan 19 00:24:53 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	{
…		…
213	for (int i = RS_styleCount; --i; )	225	for (int i = RS_styleCount; --i; )
214	if (fontset[i] != fontset[0])	226	if (fontset[i] != fontset[0])
215	delete fontset[i];	227	delete fontset[i];
216	#endif	228	#endif
217	delete fontset[0];	229	delete fontset[0];
		230
		231	#ifdef HAVE_BG_PIXMAP
		232	bgPixmap.destroy ();
		233	#endif
218		234
219	if (display)	235	if (display)
220	{	236	{
221	selection_clear ();	237	selection_clear ();
222		238
…		…
262	pix_colors_unfocused [i].free (this);	278	pix_colors_unfocused [i].free (this);
263	#endif	279	#endif
264	}	280	}
265		281
266	clear ();	282	clear ();
267	}
268		283
269	delete pix_colors_focused;	284	display->flush (); /* ideally .put should do this */
270	#if OFF_FOCUS_FADING
271	delete pix_colors_unfocused;
272	#endif
273
274	displays.put (display);	285	displays.put (display);
		286	}
275		287
276	scr_release ();	288	scr_release ();
277		289
278	/* clear all resources */	290	/* clear all resources */
279	for (int i = 0; i < allocated.size (); i++)	291	for (int i = 0; i < allocated.size (); i++)
…		…
291	delete argv;	303	delete argv;
292		304
293	#ifdef KEYSYM_RESOURCE	305	#ifdef KEYSYM_RESOURCE
294	delete keyboard;	306	delete keyboard;
295	#endif	307	#endif
		308	#ifndef NO_RESOURCES
		309	XrmDestroyDatabase (option_db);
		310	#endif
296	}	311	}
297		312
298	// child has exited, usually destroys	313	// child has exited, usually destroys
299	void	314	void
300	rxvt_term::child_cb (child_watcher &w, int status)	315	rxvt_term::child_cb (ev::child &w, int status)
301	{	316	{
302	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	317	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303		318
304	cmd_pid = 0;	319	cmd_pid = 0;
305		320
306	if (!OPTION (Opt_hold))	321	if (!option (Opt_hold))
307	destroy ();	322	destroy ();
308	}	323	}
309		324
310	void	325	void
311	rxvt_term::destroy ()	326	rxvt_term::destroy ()
312	{	327	{
313	if (destroy_ev.active)	328	if (destroy_ev.is_active ())
314	return;	329	return;
315		330
316	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317		332
318	#if ENABLE_OVERLAY	333	#if ENABLE_OVERLAY
…		…
325	im_ev.stop (display);	340	im_ev.stop (display);
326	#endif	341	#endif
327	#if HAVE_SCROLLBARS	342	#if HAVE_SCROLLBARS
328	scrollbar_ev.stop (display);	343	scrollbar_ev.stop (display);
329	#endif	344	#endif
330	#if TRANSPARENT	345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
331	rootwin_ev.stop (display);	346	rootwin_ev.stop (display);
332	#endif	347	#endif
333	incr_ev.stop ();	348	incr_ev.stop ();
334	termwin_ev.stop (display);	349	termwin_ev.stop (display);
335	vt_ev.stop (display);	350	vt_ev.stop (display);
336	}	351	}
337		352
338	check_ev.stop ();	353	flush_ev.stop ();
339	pty_ev.stop ();	354	pty_ev.stop ();
340	#ifdef CURSOR_BLINK	355	#ifdef CURSOR_BLINK
341	cursor_blink_ev.stop ();	356	cursor_blink_ev.stop ();
342	#endif	357	#endif
343	#ifdef TEXT_BLINK	358	#ifdef TEXT_BLINK
…		…
351	#endif	366	#endif
352	#ifdef POINTER_BLANK	367	#ifdef POINTER_BLANK
353	pointer_ev.stop ();	368	pointer_ev.stop ();
354	#endif	369	#endif
355		370
356	destroy_ev.start (0);	371	destroy_ev.start ();
357	}	372	}
358		373
359	void	374	void
360	rxvt_term::destroy_cb (time_watcher &w)	375	rxvt_term::destroy_cb (ev::idle &w, int revents)
361	{	376	{
362	make_current ();	377	make_current ();
363		378
364	delete this;	379	delete this;
365	}	380	}
…		…
419	else	434	else
420	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421	mesg, BUFSIZ);	436	mesg, BUFSIZ);
422	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423	}	438	}
424	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425	mesg, BUFSIZ);	440	mesg, BUFSIZ);
426	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427	}	442	}
428	#endif	443	#endif
429		444
…		…
454	rxvt_emergency_cleanup ();	469	rxvt_emergency_cleanup ();
455	_exit (EXIT_FAILURE);	470	_exit (EXIT_FAILURE);
456	}	471	}
457		472
458	/----------------------------------------------------------------------/	473	/----------------------------------------------------------------------/
459	bool	474	void
460	rxvt_term::init (int argc, const char const argv, stringvec *envv)	475	rxvt_term::init (int argc, const char const argv, stringvec *envv)
461	{	476	{
462	this->envv = envv;	477	this->envv = envv;
463		478
464	SET_R (this);	479	SET_R (this);
465	set_locale ("");	480	set_locale ("");
466	set_environ (envv); // few things in X do not call setlocale :(	481	set_environ (envv); // few things in X do not call setlocale :(
467		482
468	if (!init_vars ())	483	init_vars ();
469	return false;
470		484
471	init_secondary ();	485	init_secondary ();
472		486
473	const char **cmd_argv = init_resources (argc, argv);	487	const char **cmd_argv = init_resources (argc, argv);
474		488
475	#ifdef KEYSYM_RESOURCE	489	#ifdef KEYSYM_RESOURCE
476	keyboard->register_done ();	490	keyboard->register_done ();
477	#endif	491	#endif
478		492
479	#ifdef HAVE_SCROLLBARS	493	#ifdef HAVE_SCROLLBARS
480	if (OPTION (Opt_scrollBar))	494	if (option (Opt_scrollBar))
481	scrollBar.setIdle (); /* set existence for size calculations */	495	scrollBar.setIdle (); /* set existence for size calculations */
482	#endif	496	#endif
483		497
484	pty = ptytty::create ();	498	pty = ptytty::create ();
485		499
…		…
492	#if 0	506	#if 0
493	XSynchronize (dpy, True);	507	XSynchronize (dpy, True);
494	#endif	508	#endif
495		509
496	#ifdef HAVE_SCROLLBARS	510	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))	511	if (option (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */	512	resize_scrollbar (); /* create and map scrollbar */
499	#endif	513	#endif
		514	#ifdef HAVE_BG_PIXMAP
		515	{
		516	bgPixmap.set_target (this);
		517	bgPixmap.invalidate ();
		518
500	#ifdef TRANSPARENT	519	#ifdef ENABLE_TRANSPARENCY
501	if (OPTION (Opt_transparent))	520	if (option (Opt_transparent))
502	{	521	{
		522	bgPixmap.set_transparent ();
		523
		524	#ifdef HAVE_AFTERIMAGE
		525	if (rs [Rs_blurradius])
		526	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		527	#endif
		528	if (ISSET_PIXCOLOR (Color_tint))
		529	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		530
		531	if (rs [Rs_shade])
		532	bgPixmap.set_shade (rs [Rs_shade]);
		533
		534	bgPixmap.set_root_pixmap ();
503	XSelectInput (dpy, display->root, PropertyChangeMask);	535	XSelectInput (dpy, display->root, PropertyChangeMask);
504	check_our_parents ();
505	rootwin_ev.start (display, display->root);	536	rootwin_ev.start (display, display->root);
506	}	537	}
		538	#endif
		539
		540	#ifdef BG_IMAGE_FROM_FILE
		541	if (rs[Rs_backgroundPixmap])
		542	{
		543	const char *p = rs[Rs_backgroundPixmap];
		544
		545	if ((p = strchr (p, ';')) != 0)
		546	{
		547	p++;
		548	bgPixmap.set_geometry (p);
		549	}
		550	else
		551	bgPixmap.set_defaultGeometry ();
		552
		553	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		554	if (!bgPixmap.window_position_sensitive ())
		555	update_background ();
		556	}
		557	#endif
		558	}
		559	#endif
		560
		561	#if ENABLE_PERL
		562	rootwin_ev.start (display, display->root);
507	#endif	563	#endif
508		564
509	set_colorfgbg ();	565	set_colorfgbg ();
510		566
511	init_command (cmd_argv);	567	init_command (cmd_argv);
512		568
513	free (cmd_argv);	569	free (cmd_argv);
514		570
515	if (pty->pty >= 0)	571	if (pty->pty >= 0)
516	pty_ev.start (pty->pty, EVENT_READ);	572	pty_ev.start (pty->pty, ev::READ);
517
518	check_ev.start ();
519		573
520	HOOK_INVOKE ((this, HOOK_START, DT_END));	574	HOOK_INVOKE ((this, HOOK_START, DT_END));
521		575
522	#if ENABLE_XEMBED	576	#if ENABLE_XEMBED
523	if (rs[Rs_embed])	577	if (rs[Rs_embed])
…		…
530	#endif	584	#endif
531		585
532	XMapWindow (dpy, vt);	586	XMapWindow (dpy, vt);
533	XMapWindow (dpy, parent[0]);	587	XMapWindow (dpy, parent[0]);
534		588
535	return true;	589	refresh_check ();
536	}	590	}
537		591
538	static struct sig_handlers	592	static struct sig_handlers
539	{	593	{
540	sig_watcher sw_term, sw_int;	594	ev::sig sw_term, sw_int;
541		595
542	/*	596	/*
543	* Catch a fatal signal and tidy up before quitting	597	* Catch a fatal signal and tidy up before quitting
544	*/	598	*/
545	void	599	void sig_term (ev::sig &w, int revents);
546	sig_term (sig_watcher &w)	600
		601	sig_handlers ()
547	{	602	{
548	rxvt_emergency_cleanup ();	603	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)	604	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
556	{
557	}	605	}
558	} sig_handlers;	606	} sig_handlers;
559		607
		608	void
		609	sig_handlers::sig_term (ev::sig &w, int revents)
		610	{
		611	rxvt_emergency_cleanup ();
		612	w.stop ();
		613	kill (getpid (), w.signum);
		614	}
		615
560	char **rxvt_environ; // startup environment	616	char **rxvt_environ; // startup environment
561		617
562	void	618	void
563	rxvt_init ()	619	rxvt_init ()
564	{	620	{
565	ptytty::init ();	621	ptytty::init ();
		622
		623	if (!ev_default_loop (0))
		624	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
566		625
567	rxvt_environ = environ;	626	rxvt_environ = environ;
568		627
569	signal (SIGHUP, SIG_IGN);	628	signal (SIGHUP, SIG_IGN);
570	signal (SIGPIPE, SIG_IGN);	629	signal (SIGPIPE, SIG_IGN);
571		630
572	sig_handlers.sw_term.start (SIGTERM);	631	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
573	sig_handlers.sw_int.start (SIGINT);	632	sig_handlers.sw_int.start (SIGINT); ev_unref ();
574		633
575	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	634	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
576	/* signal (SIGURG, SIG_DFL); */	635	/* signal (SIGURG, SIG_DFL); */
577		636
578	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	637	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
580	XSetIOErrorHandler (rxvt_xioerror_handler);	639	XSetIOErrorHandler (rxvt_xioerror_handler);
581		640
582	XrmInitialize ();	641	XrmInitialize ();
583	}	642	}
584		643
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	/----------------------------------------------------------------------/	644	/----------------------------------------------------------------------/
622	/*	645	/*
623	* window size/position calculcations for XSizeHint and other storage.	646	* window size/position calculations for XSizeHint and other storage.
624	* if width/height are non-zero then override calculated width/height	647	* if width/height are non-zero then override calculated width/height
625	*/	648	*/
626	void	649	void
627	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	650	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628	{	651	{
…		…
700	if (scrollBar.state)	723	if (scrollBar.state)
701	{	724	{
702	sb_w = scrollbar_TotalWidth ();	725	sb_w = scrollbar_TotalWidth ();
703	szHint.base_width += sb_w;	726	szHint.base_width += sb_w;
704		727
705	if (!OPTION (Opt_scrollBar_right))	728	if (!option (Opt_scrollBar_right))
706	window_vt_x += sb_w;	729	window_vt_x += sb_w;
707	}	730	}
708		731
709	szHint.width_inc = fwidth;	732	szHint.width_inc = fwidth;
710	szHint.height_inc = fheight;	733	szHint.height_inc = fheight;
…		…
731	{	754	{
732	min_it (height, max_height);	755	min_it (height, max_height);
733	szHint.height = szHint.base_height + height;	756	szHint.height = szHint.base_height + height;
734	}	757	}
735		758
736	if (scrollBar.state && OPTION (Opt_scrollBar_right))	759	if (scrollBar.state && option (Opt_scrollBar_right))
737	window_sb_x = szHint.width - sb_w;	760	window_sb_x = szHint.width - sb_w;
738		761
739	if (recalc_x)	762	if (recalc_x)
740	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	763	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741		764
…		…
764	ws.ws_xpixel = width;	787	ws.ws_xpixel = width;
765	ws.ws_ypixel = height;	788	ws.ws_ypixel = height;
766	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	789	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
767		790
768	#if 0	791	#if 0
769	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	792	// TIOCSWINSZ is supposed to do this automatically and correctly
770	if (cmd_pid) /* force through to the command */	793	if (cmd_pid) /* force through to the command */
771	kill (-cmd_pid, SIGWINCH);	794	kill (-cmd_pid, SIGWINCH);
772	#endif	795	#endif
773	}	796	}
774		797
…		…
803	delete fontset[0];	826	delete fontset[0];
804	fontset[0] = fs;	827	fontset[0] = fs;
805		828
806	prop = (*fs)[1]->properties ();	829	prop = (*fs)[1]->properties ();
807	prop.height += lineSpace;	830	prop.height += lineSpace;
		831
808	fs->set_prop (prop);	832	fs->set_prop (prop, false);
809		833
810	fwidth = prop.width;	834	fwidth = prop.width;
811	fheight = prop.height;	835	fheight = prop.height;
812	fbase = prop.ascent;	836	fbase = prop.ascent;
813		837
…		…
822	{	846	{
823	fontset[style] = fs = new rxvt_fontset (this);	847	fontset[style] = fs = new rxvt_fontset (this);
824	rxvt_fontprop prop2 = prop;	848	rxvt_fontprop prop2 = prop;
825		849
826	if (res)	850	if (res)
827	prop2.weight = prop2.slant = rxvt_fontprop::unset;	851	{
		852	fs->populate (res);
		853	fs->set_prop (prop2, false);
		854	}
828	else	855	else
829	{	856	{
830	res = fontset[0]->fontdesc;	857	fs->populate (fontset[0]->fontdesc);
831		858
832	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	859	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;	860	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		861
		862	fs->set_prop (prop2, true);
834	}	863	}
835		864
836	fs->populate (res);
837	fs->set_prop (prop2);
838	}	865	}
839	#else	866	#else
840	fontset[style] = fontset[0];	867	fontset[style] = fontset[0];
841	#endif	868	#endif
842	}	869	}
…		…
844	if (parent[0])	871	if (parent[0])
845	{	872	{
846	resize_all_windows (0, 0, 0);	873	resize_all_windows (0, 0, 0);
847	scr_remap_chars ();	874	scr_remap_chars ();
848	scr_touch (true);	875	scr_touch (true);
849	}	876	}
850		877
851	return true;	878	return true;
852	}	879	}
853		880
		881	void
854	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	882	rxvt_term::set_string_property (Atom prop, const char *str, int len)
855	{	883	{
856	XChangeProperty (dpy, parent[0],	884	XChangeProperty (dpy, parent[0],
857	prop, XA_STRING, 8, PropModeReplace,	885	prop, XA_STRING, 8, PropModeReplace,
858	(const unsigned char *)str, len >= 0 ? len : strlen (str));	886	(const unsigned char *)str, len >= 0 ? len : strlen (str));
859	}	887	}
860		888
		889	void
861	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	890	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862	{	891	{
863	wchar_t *ws = rxvt_mbstowcs (str, len);	892	wchar_t *ws = rxvt_mbstowcs (str, len);
864	char *s = rxvt_wcstoutf8 (ws);	893	char *s = rxvt_wcstoutf8 (ws);
865		894
866	XChangeProperty (dpy, parent[0],	895	XChangeProperty (dpy, parent[0],
…		…
890	#if ENABLE_EWMH	919	#if ENABLE_EWMH
891	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	920	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892	#endif	921	#endif
893	}	922	}
894		923
		924	void
		925	rxvt_term::set_window_color (int idx, const char *color)
		926	{
895	#ifdef XTERM_COLOR_CHANGE	927	#ifdef XTERM_COLOR_CHANGE
896	void
897	rxvt_term::set_window_color (int idx, const char *color)
898	{
899	rxvt_color xcol;	928	rxvt_color xcol;
900	int i;	929	int i;
901		930
902	if (color == NULL \|\| *color == '\0')	931	if (color == NULL \|\| *color == '\0')
903	return;	932	return;
904		933
905	color = strdup (color);	934	color = strdup (color);
906	allocated.push_back ((void *)color);	935	allocated.push_back ((void *)color);
…		…
910	if (isdigit (*color))	939	if (isdigit (*color))
911	{	940	{
912	i = atoi (color);	941	i = atoi (color);
913		942
914	if (i >= 8 && i <= 15)	943	if (i >= 8 && i <= 15)
		944	{
915	{ /* bright colors */	945	/* bright colors */
916	i -= 8;
917	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	946	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
918	goto done;	947	goto done;
919	}	948	}
920		949
921	if (i >= 0 && i <= 7)	950	if (i >= 0 && i <= 7)
		951	{
922	{ /* normal colors */	952	/* normal colors */
923	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	953	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
924	goto done;	954	goto done;
925	}	955	}
926	}	956	}
927		957
…		…
932	* so just keep gobbling up the colormap	962	* so just keep gobbling up the colormap
933	*/	963	*/
934		964
935	pix_colors_focused[idx] = xcol;	965	pix_colors_focused[idx] = xcol;
936		966
937	/* XSetWindowAttributes attr; */
938	/* Cursor cursor; */
939	done:	967	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. /	968	/TODO: handle Color_BD, scrollbar background, etc. /
951		969
		970	update_fade_color (idx);
952	recolour_cursor ();	971	recolour_cursor ();
953	scr_recolour ();	972	scr_recolour ();
		973	#endif /* XTERM_COLOR_CHANGE */
954	}	974	}
955
956	#else
957	# define set_window_color (idx,color) ((void)0)
958	#endif /* XTERM_COLOR_CHANGE */
959		975
960	void	976	void
961	rxvt_term::recolour_cursor ()	977	rxvt_term::recolour_cursor ()
962	{	978	{
963	XColor fg, bg;	979	XColor fg, bg;
…		…
979	*/	995	*/
980	void	996	void
981	rxvt_term::set_colorfgbg ()	997	rxvt_term::set_colorfgbg ()
982	{	998	{
983	unsigned int i;	999	unsigned int i;
984	const char *xpmb = "\0";	1000	const char *xpmb = "";
985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1001	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986		1002
987	strcpy (fstr, "default");	1003	strcpy (fstr, "default");
988	strcpy (bstr, "default");	1004	strcpy (bstr, "default");
989	for (i = Color_Black; i <= Color_White; i++)	1005	for (i = Color_Black; i <= Color_White; i++)
…		…
995		1011
996	for (i = Color_Black; i <= Color_White; i++)	1012	for (i = Color_Black; i <= Color_White; i++)
997	if (pix_colors[Color_bg] == pix_colors[i])	1013	if (pix_colors[Color_bg] == pix_colors[i])
998	{	1014	{
999	sprintf (bstr, "%d", (i - Color_Black));	1015	sprintf (bstr, "%d", (i - Color_Black));
1000	#ifdef XPM_BACKGROUND	1016	#ifdef BG_IMAGE_FROM_FILE
1001	xpmb = "default;";	1017	xpmb = "default;";
1002	#endif	1018	#endif
1003	break;	1019	break;
1004	}	1020	}
1005		1021
…		…
1101		1117
1102	XMoveResizeWindow (dpy, vt,	1118	XMoveResizeWindow (dpy, vt,
1103	window_vt_x, window_vt_y,	1119	window_vt_x, window_vt_y,
1104	width, height);	1120	width, height);
1105		1121
		1122	#ifdef HAVE_BG_PIXMAP
		1123	if (bgPixmap.window_size_sensitive ())
		1124	update_background ();
		1125	#endif
		1126
1106	scr_clear ();	1127	scr_clear ();
1107	#ifdef XPM_BACKGROUND
1108	resize_pixmap ();
1109	#endif
1110	}	1128	}
1111		1129
1112	if (fix_screen \|\| old_height == 0)	1130	if (fix_screen \|\| old_height == 0)
1113	scr_reset ();	1131	scr_reset ();
1114		1132
1115	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1133	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116	//scr_touch (false);	1134	//scr_touch (false);
1117		1135
1118	#ifdef XPM_BACKGROUND	1136	#ifdef HAVE_BG_PIXMAP
1119	if (pixmap)	1137	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1138	// if (bgPixmap.pixmap)
1120	scr_touch (false);	1139	// scr_touch (false);
1121	#endif	1140	#endif
1122		1141
1123	#ifdef USE_XIM	1142	#ifdef USE_XIM
1124	IMSetPosition ();	1143	IMSetPosition ();
1125	#endif	1144	#endif
…		…
1296	if (term->rs[Rs_imLocale])	1315	if (term->rs[Rs_imLocale])
1297	SET_LOCALE (term->locale);	1316	SET_LOCALE (term->locale);
1298	}	1317	}
1299	else	1318	else
1300	str = (void *)text->string.wide_char;	1319	str = (void *)text->string.wide_char;
1301		1320
1302	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1321	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303	DT_INT, call_data->caret,	1322	DT_INT, call_data->caret,
1304	DT_INT, call_data->chg_first,	1323	DT_INT, call_data->chg_first,
1305	DT_INT, call_data->chg_length,	1324	DT_INT, call_data->chg_length,
1306	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1325	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1625		1644
1626	if (input_style & XIMPreeditPosition)	1645	if (input_style & XIMPreeditPosition)
1627	{	1646	{
1628	im_set_size (preedit_rect);	1647	im_set_size (preedit_rect);
1629	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1648	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630		1649
1631	XSetICValues (Input_Context,	1650	XSetICValues (Input_Context,
1632	XNPreeditAttributes, preedit_attr, NULL);	1651	XNPreeditAttributes, preedit_attr, NULL);
1633	}	1652	}
1634	else	1653	else
1635	{	1654	{
…		…
1652	XFree (status_attr);	1671	XFree (status_attr);
1653	}	1672	}
1654		1673
1655	XFree (preedit_attr);	1674	XFree (preedit_attr);
1656	}	1675	}
1657	#endif /* USE_XIM */	1676	#endif /* USE_XIM */
		1677
		1678	void
		1679	rxvt_term::get_window_origin (int &x, int &y)
		1680	{
		1681	Window cr;
		1682	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1683	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1684	}
		1685
		1686	Pixmap
		1687	rxvt_term::get_pixmap_property (int prop_id)
		1688	{
		1689	if (prop_id > 0 && prop_id < NUM_XA)
		1690	if (xa[prop_id])
		1691	{
		1692	int aformat;
		1693	unsigned long nitems, bytes_after;
		1694	Atom atype;
		1695	unsigned char *prop = NULL;
		1696	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1697	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1698	&nitems, &bytes_after, &prop);
		1699	if (result == Success && prop && atype == XA_PIXMAP)
		1700	return (Pixmap )prop;
		1701	}
		1702
		1703	return None;
		1704	}
		1705
		1706	#ifdef HAVE_BG_PIXMAP
		1707	# if TRACE_PIXMAPS
		1708	# undef update_background
		1709	void
		1710	rxvt_term::trace_update_background (const char *file, int line)
		1711	{
		1712	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1713	update_background ();
		1714	}
		1715	# endif
		1716
		1717	void
		1718	rxvt_term::update_background ()
		1719	{
		1720	if (update_background_ev.is_active ())
		1721	return;
		1722
		1723	bgPixmap.invalidate ();
		1724
		1725	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1726
		1727	if (to_wait <= 0.)
		1728	bgPixmap.render ();
		1729	else
		1730	update_background_ev.start (to_wait);
		1731	}
		1732
		1733	void
		1734	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1735	{
		1736	make_current ();
		1737
		1738	update_background_ev.stop ();
		1739	bgPixmap.render ();
		1740	refresh_check ();
		1741	}
		1742
		1743	#endif /* HAVE_BG_PIXMAP */
1658		1744
1659	/----------------------- end-of-file (C source) -----------------------/	1745	/----------------------- 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.222 by root, Sun Feb 12 09:44:04 2006 UTC vs. Revision 1.300 by root, Sat Jan 19 00:24:53 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.222 by root, Sun Feb 12 09:44:04 2006 UTC vs.
Revision 1.300 by root, Sat Jan 19 00:24:53 2008 UTC