[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.305 by ayin, Sun Feb 17 11:37:21 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-2008 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);
150	#endif
151	#ifdef HAVE_SCROLLBARS
152	scrollbar_ev (this, &rxvt_term::x_cb),
153	#endif	158	#endif
154	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156	#endif	161	#endif
157	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159	#endif	164	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162	#endif	167	#endif
163	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165	#endif	170	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	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),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168	#endif	180	#endif
169	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171	#endif	183	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	#ifndef NO_BELL	184	#ifndef NO_BELL
176	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177	#endif	186	#endif
178	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185	incr_ev (this, &rxvt_term::incr_cb)	194
186	{
187	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188		196
189	termlist.push_back (this);	197	termlist.push_back (this);
190		198
191	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
193	#endif	201	#endif
194	}	202	}
195		203
196	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
197	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
198	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
199	{	208	{
200	if (cmd_pid)	209	if (cmd_pid)
201	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
202		211
		212	pty_ev.stop ();
203	delete pty; pty = 0;	213	delete pty; pty = 0;
204	}	214	}
205		215
206	rxvt_term::~rxvt_term ()	216	rxvt_term::~rxvt_term ()
207	{	217	{
…		…
213	for (int i = RS_styleCount; --i; )	223	for (int i = RS_styleCount; --i; )
214	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
215	delete fontset[i];	225	delete fontset[i];
216	#endif	226	#endif
217	delete fontset[0];	227	delete fontset[0];
		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
218		232
219	if (display)	233	if (display)
220	{	234	{
221	selection_clear ();	235	selection_clear ();
222		236
…		…
262	pix_colors_unfocused [i].free (this);	276	pix_colors_unfocused [i].free (this);
263	#endif	277	#endif
264	}	278	}
265		279
266	clear ();	280	clear ();
267	}
268		281
269	delete pix_colors_focused;	282	display->flush (); /* ideally .put should do this */
270	#if OFF_FOCUS_FADING
271	delete pix_colors_unfocused;
272	#endif
273
274	displays.put (display);	283	displays.put (display);
		284	}
275		285
276	scr_release ();	286	scr_release ();
277		287
278	/* clear all resources */	288	/* clear all resources */
279	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
…		…
291	delete argv;	301	delete argv;
292		302
293	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
294	delete keyboard;	304	delete keyboard;
295	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
296	}	309	}
297		310
298	// child has exited, usually destroys	311	// child has exited, usually destroys
299	void	312	void
300	rxvt_term::child_cb (child_watcher &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
301	{	314	{
302	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	315	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303		316
304	cmd_pid = 0;	317	cmd_pid = 0;
305		318
306	if (!OPTION (Opt_hold))	319	if (!option (Opt_hold))
307	destroy ();	320	destroy ();
308	}	321	}
309		322
310	void	323	void
311	rxvt_term::destroy ()	324	rxvt_term::destroy ()
312	{	325	{
313	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
314	return;	327	return;
315		328
316	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317		330
318	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
…		…
322	if (display)	335	if (display)
323	{	336	{
324	#if USE_XIM	337	#if USE_XIM
325	im_ev.stop (display);	338	im_ev.stop (display);
326	#endif	339	#endif
327	#if HAVE_SCROLLBARS
328	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
329	#endif	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
330	#if TRANSPARENT
331	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
332	#endif	343	#endif
333	incr_ev.stop ();	344	incr_ev.stop ();
334	termwin_ev.stop (display);	345	termwin_ev.stop (display);
335	vt_ev.stop (display);	346	vt_ev.stop (display);
336	}	347	}
337		348
338	check_ev.stop ();	349	flush_ev.stop ();
339	pty_ev.stop ();	350	pty_ev.stop ();
340	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
341	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
342	#endif	353	#endif
343	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
351	#endif	362	#endif
352	#ifdef POINTER_BLANK	363	#ifdef POINTER_BLANK
353	pointer_ev.stop ();	364	pointer_ev.stop ();
354	#endif	365	#endif
355		366
356	destroy_ev.start (0);	367	destroy_ev.start ();
357	}	368	}
358		369
359	void	370	void
360	rxvt_term::destroy_cb (time_watcher &w)	371	rxvt_term::destroy_cb (ev::idle &w, int revents)
361	{	372	{
362	make_current ();	373	make_current ();
363		374
364	delete this;	375	delete this;
365	}	376	}
…		…
419	else	430	else
420	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421	mesg, BUFSIZ);	432	mesg, BUFSIZ);
422	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423	}	434	}
424	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425	mesg, BUFSIZ);	436	mesg, BUFSIZ);
426	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427	}	438	}
428	#endif	439	#endif
429		440
…		…
453	DisplayString (display));	464	DisplayString (display));
454	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
455	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
456	}	467	}
457		468
458	/----------------------------------------------------------------------/
459	bool
460	rxvt_term::init (int argc, const char const argv, stringvec *envv)
461	{
462	this->envv = envv;
463
464	SET_R (this);
465	set_locale ("");
466	set_environ (envv); // few things in X do not call setlocale :(
467
468	if (!init_vars ())
469	return false;
470
471	init_secondary ();
472
473	const char **cmd_argv = init_resources (argc, argv);
474
475	#ifdef KEYSYM_RESOURCE
476	keyboard->register_done ();
477	#endif
478
479	#ifdef HAVE_SCROLLBARS
480	if (OPTION (Opt_scrollBar))
481	scrollBar.setIdle (); /* set existence for size calculations */
482	#endif
483
484	pty = ptytty::create ();
485
486	create_windows (argc, argv);
487
488	init_xlocale ();
489
490	scr_reset (); // initialize screen
491
492	#if 0
493	XSynchronize (dpy, True);
494	#endif
495
496	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */
499	#endif
500	#ifdef TRANSPARENT
501	if (OPTION (Opt_transparent))
502	{
503	XSelectInput (dpy, display->root, PropertyChangeMask);
504	check_our_parents ();
505	rootwin_ev.start (display, display->root);
506	}
507	#endif
508
509	set_colorfgbg ();
510
511	init_command (cmd_argv);
512
513	free (cmd_argv);
514
515	if (pty->pty >= 0)
516	pty_ev.start (pty->pty, EVENT_READ);
517
518	check_ev.start ();
519
520	HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522	#if ENABLE_XEMBED
523	if (rs[Rs_embed])
524	{
525	long info[2] = { 0, XEMBED_MAPPED };
526
527	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528	32, PropModeReplace, (unsigned char *)&info, 2);
529	}
530	#endif
531
532	XMapWindow (dpy, vt);
533	XMapWindow (dpy, parent[0]);
534
535	return true;
536	}
537
538	static struct sig_handlers	469	static struct sig_handlers
539	{	470	{
540	sig_watcher sw_term, sw_int;	471	ev::sig sw_term, sw_int;
541		472
542	/*	473	/*
543	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
544	*/	475	*/
545	void	476	void sig_term (ev::sig &w, int revents);
546	sig_term (sig_watcher &w)	477
		478	sig_handlers ()
547	{	479	{
548	rxvt_emergency_cleanup ();	480	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)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
556	{
557	}	482	}
558	} sig_handlers;	483	} sig_handlers;
559		484
		485	void
		486	sig_handlers::sig_term (ev::sig &w, int revents)
		487	{
		488	rxvt_emergency_cleanup ();
		489	w.stop ();
		490	kill (getpid (), w.signum);
		491	}
		492
560	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
561		494
562	void	495	void
563	rxvt_init ()	496	rxvt_init ()
564	{	497	{
565	ptytty::init ();	498	ptytty::init ();
		499
		500	if (!ev_default_loop (0))
		501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
566		502
567	rxvt_environ = environ;	503	rxvt_environ = environ;
568		504
569	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
570	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
571		507
572	sig_handlers.sw_term.start (SIGTERM);	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
573	sig_handlers.sw_int.start (SIGINT);	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
574		510
575	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
576	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
577		513
578	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
580	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
581		517
582	XrmInitialize ();	518	XrmInitialize ();
583	}	519	}
584		520
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	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
622	/*	522	/*
623	* window size/position calculcations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
624	* if width/height are non-zero then override calculated width/height	524	* if width/height are non-zero then override calculated width/height
625	*/	525	*/
626	void	526	void
627	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628	{	528	{
…		…
697	sb_w = 0;	597	sb_w = 0;
698	window_vt_x = window_vt_y = int_bwidth;	598	window_vt_x = window_vt_y = int_bwidth;
699		599
700	if (scrollBar.state)	600	if (scrollBar.state)
701	{	601	{
702	sb_w = scrollbar_TotalWidth ();	602	sb_w = scrollBar.total_width ();
703	szHint.base_width += sb_w;	603	szHint.base_width += sb_w;
704		604
705	if (!OPTION (Opt_scrollBar_right))	605	if (!option (Opt_scrollBar_right))
706	window_vt_x += sb_w;	606	window_vt_x += sb_w;
707	}	607	}
708		608
709	szHint.width_inc = fwidth;	609	szHint.width_inc = fwidth;
710	szHint.height_inc = fheight;	610	szHint.height_inc = fheight;
…		…
731	{	631	{
732	min_it (height, max_height);	632	min_it (height, max_height);
733	szHint.height = szHint.base_height + height;	633	szHint.height = szHint.base_height + height;
734	}	634	}
735		635
736	if (scrollBar.state && OPTION (Opt_scrollBar_right))	636	if (scrollBar.state && option (Opt_scrollBar_right))
737	window_sb_x = szHint.width - sb_w;	637	window_sb_x = szHint.width - sb_w;
738		638
739	if (recalc_x)	639	if (recalc_x)
740	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	640	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741		641
…		…
764	ws.ws_xpixel = width;	664	ws.ws_xpixel = width;
765	ws.ws_ypixel = height;	665	ws.ws_ypixel = height;
766	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
767		667
768	#if 0	668	#if 0
769	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	669	// TIOCSWINSZ is supposed to do this automatically and correctly
770	if (cmd_pid) /* force through to the command */	670	if (cmd_pid) /* force through to the command */
771	kill (-cmd_pid, SIGWINCH);	671	kill (-cmd_pid, SIGWINCH);
772	#endif	672	#endif
773	}	673	}
774		674
…		…
803	delete fontset[0];	703	delete fontset[0];
804	fontset[0] = fs;	704	fontset[0] = fs;
805		705
806	prop = (*fs)[1]->properties ();	706	prop = (*fs)[1]->properties ();
807	prop.height += lineSpace;	707	prop.height += lineSpace;
		708
808	fs->set_prop (prop);	709	fs->set_prop (prop, false);
809		710
810	fwidth = prop.width;	711	fwidth = prop.width;
811	fheight = prop.height;	712	fheight = prop.height;
812	fbase = prop.ascent;	713	fbase = prop.ascent;
813		714
…		…
822	{	723	{
823	fontset[style] = fs = new rxvt_fontset (this);	724	fontset[style] = fs = new rxvt_fontset (this);
824	rxvt_fontprop prop2 = prop;	725	rxvt_fontprop prop2 = prop;
825		726
826	if (res)	727	if (res)
827	prop2.weight = prop2.slant = rxvt_fontprop::unset;	728	{
		729	fs->populate (res);
		730	fs->set_prop (prop2, false);
		731	}
828	else	732	else
829	{	733	{
830	res = fontset[0]->fontdesc;	734	fs->populate (fontset[0]->fontdesc);
831		735
832	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	736	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;	737	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		738
		739	fs->set_prop (prop2, true);
834	}	740	}
835		741
836	fs->populate (res);
837	fs->set_prop (prop2);
838	}	742	}
839	#else	743	#else
840	fontset[style] = fontset[0];	744	fontset[style] = fontset[0];
841	#endif	745	#endif
842	}	746	}
…		…
844	if (parent[0])	748	if (parent[0])
845	{	749	{
846	resize_all_windows (0, 0, 0);	750	resize_all_windows (0, 0, 0);
847	scr_remap_chars ();	751	scr_remap_chars ();
848	scr_touch (true);	752	scr_touch (true);
849	}	753	}
850		754
851	return true;	755	return true;
852	}	756	}
853		757
		758	void
854	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	759	rxvt_term::set_string_property (Atom prop, const char *str, int len)
855	{	760	{
856	XChangeProperty (dpy, parent[0],	761	XChangeProperty (dpy, parent[0],
857	prop, XA_STRING, 8, PropModeReplace,	762	prop, XA_STRING, 8, PropModeReplace,
858	(const unsigned char *)str, len >= 0 ? len : strlen (str));	763	(const unsigned char *)str, len >= 0 ? len : strlen (str));
859	}	764	}
860		765
		766	void
861	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	767	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862	{	768	{
863	wchar_t *ws = rxvt_mbstowcs (str, len);	769	wchar_t *ws = rxvt_mbstowcs (str, len);
864	char *s = rxvt_wcstoutf8 (ws);	770	char *s = rxvt_wcstoutf8 (ws);
865		771
866	XChangeProperty (dpy, parent[0],	772	XChangeProperty (dpy, parent[0],
…		…
890	#if ENABLE_EWMH	796	#if ENABLE_EWMH
891	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892	#endif	798	#endif
893	}	799	}
894		800
		801	void
		802	rxvt_term::set_window_color (int idx, const char *color)
		803	{
895	#ifdef XTERM_COLOR_CHANGE	804	#ifdef XTERM_COLOR_CHANGE
896	void
897	rxvt_term::set_window_color (int idx, const char *color)
898	{
899	rxvt_color xcol;	805	rxvt_color xcol;
900	int i;	806
901
902	if (color == NULL \|\| *color == '\0')	807	if (color == NULL \|\| *color == '\0')
903	return;	808	return;
904		809
905	color = strdup (color);	810	color = strdup (color);
906	allocated.push_back ((void *)color);	811	allocated.push_back ((void *)color);
907	rs[Rs_color + idx] = color;	812	rs[Rs_color + idx] = color;
908		813
909	/* handle color aliases */	814	/* handle color aliases */
910	if (isdigit (*color))	815	if (isdigit (*color))
911	{	816	{
912	i = atoi (color);	817	int i = atoi (color);
913		818
914	if (i >= 8 && i <= 15)	819	if (i >= 8 && i <= 15)
		820	{
915	{ /* bright colors */	821	/* bright colors */
916	i -= 8;
917	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	822	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
918	goto done;	823	goto done;
919	}	824	}
920		825
921	if (i >= 0 && i <= 7)	826	if (i >= 0 && i <= 7)
		827	{
922	{ /* normal colors */	828	/* normal colors */
923	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	829	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
924	goto done;	830	goto done;
925	}	831	}
926	}	832	}
927		833
…		…
932	* so just keep gobbling up the colormap	838	* so just keep gobbling up the colormap
933	*/	839	*/
934		840
935	pix_colors_focused[idx] = xcol;	841	pix_colors_focused[idx] = xcol;
936		842
937	/* XSetWindowAttributes attr; */
938	/* Cursor cursor; */
939	done:	843	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. /	844	/TODO: handle Color_BD, scrollbar background, etc. /
951		845
		846	update_fade_color (idx);
952	recolour_cursor ();	847	recolour_cursor ();
953	scr_recolour ();	848	scr_recolour ();
		849	#endif /* XTERM_COLOR_CHANGE */
954	}	850	}
955
956	#else
957	# define set_window_color (idx,color) ((void)0)
958	#endif /* XTERM_COLOR_CHANGE */
959		851
960	void	852	void
961	rxvt_term::recolour_cursor ()	853	rxvt_term::recolour_cursor ()
962	{	854	{
963	XColor fg, bg;	855	XColor fg, bg;
…		…
979	*/	871	*/
980	void	872	void
981	rxvt_term::set_colorfgbg ()	873	rxvt_term::set_colorfgbg ()
982	{	874	{
983	unsigned int i;	875	unsigned int i;
984	const char *xpmb = "\0";	876	const char *xpmb = "";
985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	877	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986		878
987	strcpy (fstr, "default");	879	strcpy (fstr, "default");
988	strcpy (bstr, "default");	880	strcpy (bstr, "default");
989	for (i = Color_Black; i <= Color_White; i++)	881	for (i = Color_Black; i <= Color_White; i++)
…		…
995		887
996	for (i = Color_Black; i <= Color_White; i++)	888	for (i = Color_Black; i <= Color_White; i++)
997	if (pix_colors[Color_bg] == pix_colors[i])	889	if (pix_colors[Color_bg] == pix_colors[i])
998	{	890	{
999	sprintf (bstr, "%d", (i - Color_Black));	891	sprintf (bstr, "%d", (i - Color_Black));
1000	#ifdef XPM_BACKGROUND	892	#ifdef BG_IMAGE_FROM_FILE
1001	xpmb = "default;";	893	xpmb = "default;";
1002	#endif	894	#endif
1003	break;	895	break;
1004	}	896	}
1005		897
…		…
1093	{	985	{
1094	if (scrollBar.state)	986	if (scrollBar.state)
1095	{	987	{
1096	XMoveResizeWindow (dpy, scrollBar.win,	988	XMoveResizeWindow (dpy, scrollBar.win,
1097	window_sb_x, 0,	989	window_sb_x, 0,
1098	scrollbar_TotalWidth (), szHint.height);	990	scrollBar.total_width (), szHint.height);
1099	resize_scrollbar ();	991	resize_scrollbar ();
1100	}	992	}
1101		993
1102	XMoveResizeWindow (dpy, vt,	994	XMoveResizeWindow (dpy, vt,
1103	window_vt_x, window_vt_y,	995	window_vt_x, window_vt_y,
1104	width, height);	996	width, height);
1105		997
		998	#ifdef HAVE_BG_PIXMAP
		999	if (bgPixmap.window_size_sensitive ())
		1000	update_background ();
		1001	#endif
		1002
1106	scr_clear ();	1003	scr_clear ();
1107	#ifdef XPM_BACKGROUND
1108	resize_pixmap ();
1109	#endif
1110	}	1004	}
1111		1005
1112	if (fix_screen \|\| old_height == 0)	1006	if (fix_screen \|\| old_height == 0)
1113	scr_reset ();	1007	scr_reset ();
1114		1008
1115	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1009	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116	//scr_touch (false);	1010	//scr_touch (false);
1117		1011
1118	#ifdef XPM_BACKGROUND	1012	#ifdef HAVE_BG_PIXMAP
1119	if (pixmap)	1013	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1014	// if (bgPixmap.pixmap)
1120	scr_touch (false);	1015	// scr_touch (false);
1121	#endif	1016	#endif
1122		1017
1123	#ifdef USE_XIM	1018	#ifdef USE_XIM
1124	IMSetPosition ();	1019	IMSetPosition ();
1125	#endif	1020	#endif
…		…
1296	if (term->rs[Rs_imLocale])	1191	if (term->rs[Rs_imLocale])
1297	SET_LOCALE (term->locale);	1192	SET_LOCALE (term->locale);
1298	}	1193	}
1299	else	1194	else
1300	str = (void *)text->string.wide_char;	1195	str = (void *)text->string.wide_char;
1301		1196
1302	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303	DT_INT, call_data->caret,	1198	DT_INT, call_data->caret,
1304	DT_INT, call_data->chg_first,	1199	DT_INT, call_data->chg_first,
1305	DT_INT, call_data->chg_length,	1200	DT_INT, call_data->chg_length,
1306	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1201	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1625		1520
1626	if (input_style & XIMPreeditPosition)	1521	if (input_style & XIMPreeditPosition)
1627	{	1522	{
1628	im_set_size (preedit_rect);	1523	im_set_size (preedit_rect);
1629	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1524	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630		1525
1631	XSetICValues (Input_Context,	1526	XSetICValues (Input_Context,
1632	XNPreeditAttributes, preedit_attr, NULL);	1527	XNPreeditAttributes, preedit_attr, NULL);
1633	}	1528	}
1634	else	1529	else
1635	{	1530	{
…		…
1652	XFree (status_attr);	1547	XFree (status_attr);
1653	}	1548	}
1654		1549
1655	XFree (preedit_attr);	1550	XFree (preedit_attr);
1656	}	1551	}
1657	#endif /* USE_XIM */	1552	#endif /* USE_XIM */
		1553
		1554	void
		1555	rxvt_term::get_window_origin (int &x, int &y)
		1556	{
		1557	Window cr;
		1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1560	}
		1561
		1562	Pixmap
		1563	rxvt_term::get_pixmap_property (int prop_id)
		1564	{
		1565	if (prop_id > 0 && prop_id < NUM_XA)
		1566	if (xa[prop_id])
		1567	{
		1568	int aformat;
		1569	unsigned long nitems, bytes_after;
		1570	Atom atype;
		1571	unsigned char *prop = NULL;
		1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1574	&nitems, &bytes_after, &prop);
		1575	if (result == Success && prop && atype == XA_PIXMAP)
		1576	return (Pixmap )prop;
		1577	}
		1578
		1579	return None;
		1580	}
		1581
		1582	#ifdef HAVE_BG_PIXMAP
		1583	# if TRACE_PIXMAPS
		1584	# undef update_background
		1585	void
		1586	rxvt_term::trace_update_background (const char *file, int line)
		1587	{
		1588	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1589	update_background ();
		1590	}
		1591	# endif
		1592
		1593	void
		1594	rxvt_term::update_background ()
		1595	{
		1596	if (update_background_ev.is_active ())
		1597	return;
		1598
		1599	bgPixmap.invalidate ();
		1600
		1601	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1602
		1603	if (to_wait <= 0.)
		1604	bgPixmap.render ();
		1605	else
		1606	update_background_ev.start (to_wait);
		1607	}
		1608
		1609	void
		1610	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1611	{
		1612	make_current ();
		1613
		1614	update_background_ev.stop ();
		1615	bgPixmap.render ();
		1616	refresh_check ();
		1617	}
		1618
		1619	#endif /* HAVE_BG_PIXMAP */
1658		1620
1659	/----------------------- end-of-file (C source) -----------------------/	1621	/----------------------- 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.305 by ayin, Sun Feb 17 11:37:21 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.305 by ayin, Sun Feb 17 11:37:21 2008 UTC