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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.224 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
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::x_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
203	pty_ev.stop ();	214	pty_ev.stop ();
…		…
265	}	276	}
266		277
267	clear ();	278	clear ();
268	}	279	}
269		280
270	delete pix_colors_focused;	281	delete [] pix_colors_focused;
271	#if OFF_FOCUS_FADING	282	#if OFF_FOCUS_FADING
272	delete pix_colors_unfocused;	283	delete [] pix_colors_unfocused;
273	#endif	284	#endif
274		285
		286	#ifdef HAVE_BG_PIXMAP
		287	bgPixmap.destroy ();
		288	#endif
275	displays.put (display);	289	displays.put (display);
276		290
277	scr_release ();	291	scr_release ();
278		292
279	/* clear all resources */	293	/* clear all resources */
…		…
292	delete argv;	306	delete argv;
293		307
294	#ifdef KEYSYM_RESOURCE	308	#ifdef KEYSYM_RESOURCE
295	delete keyboard;	309	delete keyboard;
296	#endif	310	#endif
		311	#ifndef NO_RESOURCES
		312	XrmDestroyDatabase (option_db);
		313	#endif
297	}	314	}
298		315
299	// child has exited, usually destroys	316	// child has exited, usually destroys
300	void	317	void
301	rxvt_term::child_cb (child_watcher &w, int status)	318	rxvt_term::child_cb (ev::child &w, int status)
302	{	319	{
303	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	320	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304		321
305	cmd_pid = 0;	322	cmd_pid = 0;
306		323
307	if (!OPTION (Opt_hold))	324	if (!option (Opt_hold))
308	destroy ();	325	destroy ();
309	}	326	}
310		327
311	void	328	void
312	rxvt_term::destroy ()	329	rxvt_term::destroy ()
313	{	330	{
314	if (destroy_ev.active)	331	if (destroy_ev.is_active ())
315	return;	332	return;
316		333
317	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	334	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318		335
319	#if ENABLE_OVERLAY	336	#if ENABLE_OVERLAY
…		…
326	im_ev.stop (display);	343	im_ev.stop (display);
327	#endif	344	#endif
328	#if HAVE_SCROLLBARS	345	#if HAVE_SCROLLBARS
329	scrollbar_ev.stop (display);	346	scrollbar_ev.stop (display);
330	#endif	347	#endif
331	#if TRANSPARENT	348	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
332	rootwin_ev.stop (display);	349	rootwin_ev.stop (display);
333	#endif	350	#endif
334	incr_ev.stop ();	351	incr_ev.stop ();
335	termwin_ev.stop (display);	352	termwin_ev.stop (display);
336	vt_ev.stop (display);	353	vt_ev.stop (display);
337	}	354	}
338		355
339	check_ev.stop ();	356	flush_ev.stop ();
340	pty_ev.stop ();	357	pty_ev.stop ();
341	#ifdef CURSOR_BLINK	358	#ifdef CURSOR_BLINK
342	cursor_blink_ev.stop ();	359	cursor_blink_ev.stop ();
343	#endif	360	#endif
344	#ifdef TEXT_BLINK	361	#ifdef TEXT_BLINK
…		…
352	#endif	369	#endif
353	#ifdef POINTER_BLANK	370	#ifdef POINTER_BLANK
354	pointer_ev.stop ();	371	pointer_ev.stop ();
355	#endif	372	#endif
356		373
357	destroy_ev.start (0);	374	destroy_ev.start ();
358	}	375	}
359		376
360	void	377	void
361	rxvt_term::destroy_cb (time_watcher &w)	378	rxvt_term::destroy_cb (ev::idle &w, int revents)
362	{	379	{
363	make_current ();	380	make_current ();
364		381
365	delete this;	382	delete this;
366	}	383	}
…		…
420	else	437	else
421	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	438	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422	mesg, BUFSIZ);	439	mesg, BUFSIZ);
423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424	}	441	}
425	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	442	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426	mesg, BUFSIZ);	443	mesg, BUFSIZ);
427	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	444	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428	}	445	}
429	#endif	446	#endif
430		447
…		…
455	rxvt_emergency_cleanup ();	472	rxvt_emergency_cleanup ();
456	_exit (EXIT_FAILURE);	473	_exit (EXIT_FAILURE);
457	}	474	}
458		475
459	/----------------------------------------------------------------------/	476	/----------------------------------------------------------------------/
460	bool	477	void
461	rxvt_term::init (int argc, const char const argv, stringvec *envv)	478	rxvt_term::init (int argc, const char const argv, stringvec *envv)
462	{	479	{
463	this->envv = envv;	480	this->envv = envv;
464		481
465	SET_R (this);	482	SET_R (this);
466	set_locale ("");	483	set_locale ("");
467	set_environ (envv); // few things in X do not call setlocale :(	484	set_environ (envv); // few things in X do not call setlocale :(
468		485
469	if (!init_vars ())	486	init_vars ();
470	return false;
471		487
472	init_secondary ();	488	init_secondary ();
473		489
474	const char **cmd_argv = init_resources (argc, argv);	490	const char **cmd_argv = init_resources (argc, argv);
475		491
476	#ifdef KEYSYM_RESOURCE	492	#ifdef KEYSYM_RESOURCE
477	keyboard->register_done ();	493	keyboard->register_done ();
478	#endif	494	#endif
479		495
480	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
481	if (OPTION (Opt_scrollBar))	497	if (option (Opt_scrollBar))
482	scrollBar.setIdle (); /* set existence for size calculations */	498	scrollBar.setIdle (); /* set existence for size calculations */
483	#endif	499	#endif
484		500
485	pty = ptytty::create ();	501	pty = ptytty::create ();
486		502
…		…
493	#if 0	509	#if 0
494	XSynchronize (dpy, True);	510	XSynchronize (dpy, True);
495	#endif	511	#endif
496		512
497	#ifdef HAVE_SCROLLBARS	513	#ifdef HAVE_SCROLLBARS
498	if (OPTION (Opt_scrollBar))	514	if (option (Opt_scrollBar))
499	resize_scrollbar (); /* create and map scrollbar */	515	resize_scrollbar (); /* create and map scrollbar */
500	#endif	516	#endif
		517	#ifdef HAVE_BG_PIXMAP
		518	{
		519	bgPixmap.set_target (this);
		520
501	#ifdef TRANSPARENT	521	#ifdef ENABLE_TRANSPARENCY
502	if (OPTION (Opt_transparent))	522	if (option (Opt_transparent))
503	{	523	{
		524	bgPixmap.set_transparent ();
		525	#ifdef HAVE_AFTERIMAGE
		526	if (rs [Rs_blurradius])
		527	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		528	#endif
		529	if (ISSET_PIXCOLOR (Color_tint))
		530	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		531	if (rs [Rs_shade])
		532	bgPixmap.set_shade (rs [Rs_shade]);
		533
		534	bgPixmap.set_root_pixmap ();
504	XSelectInput (dpy, display->root, PropertyChangeMask);	535	XSelectInput (dpy, display->root, PropertyChangeMask);
505	check_our_parents ();
506	rootwin_ev.start (display, display->root);	536	rootwin_ev.start (display, display->root);
507	}	537	}
		538	#endif
		539
		540	#ifdef BG_IMAGE_FROM_FILE
		541	if (rs[Rs_backgroundPixmap] != NULL)
		542	{
		543	const char *p = rs[Rs_backgroundPixmap];
		544
		545	if ((p = strchr (p, ';')) != NULL)
		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);
508	#endif	563	#endif
509		564
510	set_colorfgbg ();	565	set_colorfgbg ();
511		566
512	init_command (cmd_argv);	567	init_command (cmd_argv);
513		568
514	free (cmd_argv);	569	free (cmd_argv);
515		570
516	if (pty->pty >= 0)	571	if (pty->pty >= 0)
517	pty_ev.start (pty->pty, EVENT_READ);	572	pty_ev.start (pty->pty, ev::READ);
518
519	check_ev.start ();
520		573
521	HOOK_INVOKE ((this, HOOK_START, DT_END));	574	HOOK_INVOKE ((this, HOOK_START, DT_END));
522		575
523	#if ENABLE_XEMBED	576	#if ENABLE_XEMBED
524	if (rs[Rs_embed])	577	if (rs[Rs_embed])
…		…
530	}	583	}
531	#endif	584	#endif
532		585
533	XMapWindow (dpy, vt);	586	XMapWindow (dpy, vt);
534	XMapWindow (dpy, parent[0]);	587	XMapWindow (dpy, parent[0]);
535
536	return true;
537	}	588	}
538		589
539	static struct sig_handlers	590	static struct sig_handlers
540	{	591	{
541	sig_watcher sw_term, sw_int;	592	ev::sig sw_term, sw_int;
542		593
543	/*	594	/*
544	* Catch a fatal signal and tidy up before quitting	595	* Catch a fatal signal and tidy up before quitting
545	*/	596	*/
546	void	597	void sig_term (ev::sig &w, int revents);
547	sig_term (sig_watcher &w)	598
		599	sig_handlers ()
548	{	600	{
549	rxvt_emergency_cleanup ();	601	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
550	signal (w.signum, SIG_DFL);
551	kill (getpid (), w.signum);
552	}
553
554	sig_handlers ()
555	: sw_term (this, &sig_handlers::sig_term),
556	sw_int (this, &sig_handlers::sig_term)	602	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
557	{
558	}	603	}
559	} sig_handlers;	604	} sig_handlers;
560		605
		606	void
		607	sig_handlers::sig_term (ev::sig &w, int revents)
		608	{
		609	rxvt_emergency_cleanup ();
		610	w.stop ();
		611	kill (getpid (), w.signum);
		612	}
		613
561	char **rxvt_environ; // startup environment	614	char **rxvt_environ; // startup environment
562		615
563	void	616	void
564	rxvt_init ()	617	rxvt_init ()
565	{	618	{
566	ptytty::init ();	619	ptytty::init ();
		620
		621	if (!ev_default_loop (0))
		622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
567		623
568	rxvt_environ = environ;	624	rxvt_environ = environ;
569		625
570	signal (SIGHUP, SIG_IGN);	626	signal (SIGHUP, SIG_IGN);
571	signal (SIGPIPE, SIG_IGN);	627	signal (SIGPIPE, SIG_IGN);
572		628
573	sig_handlers.sw_term.start (SIGTERM);	629	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574	sig_handlers.sw_int.start (SIGINT);	630	sig_handlers.sw_int.start (SIGINT); ev_unref ();
575		631
576	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
577	/* signal (SIGURG, SIG_DFL); */	633	/* signal (SIGURG, SIG_DFL); */
578		634
579	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
619	return p;	675	return p;
620	}	676	}
621		677
622	/----------------------------------------------------------------------/	678	/----------------------------------------------------------------------/
623	/*	679	/*
624	* window size/position calculcations for XSizeHint and other storage.	680	* window size/position calculations for XSizeHint and other storage.
625	* if width/height are non-zero then override calculated width/height	681	* if width/height are non-zero then override calculated width/height
626	*/	682	*/
627	void	683	void
628	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	684	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629	{	685	{
…		…
701	if (scrollBar.state)	757	if (scrollBar.state)
702	{	758	{
703	sb_w = scrollbar_TotalWidth ();	759	sb_w = scrollbar_TotalWidth ();
704	szHint.base_width += sb_w;	760	szHint.base_width += sb_w;
705		761
706	if (!OPTION (Opt_scrollBar_right))	762	if (!option (Opt_scrollBar_right))
707	window_vt_x += sb_w;	763	window_vt_x += sb_w;
708	}	764	}
709		765
710	szHint.width_inc = fwidth;	766	szHint.width_inc = fwidth;
711	szHint.height_inc = fheight;	767	szHint.height_inc = fheight;
…		…
732	{	788	{
733	min_it (height, max_height);	789	min_it (height, max_height);
734	szHint.height = szHint.base_height + height;	790	szHint.height = szHint.base_height + height;
735	}	791	}
736		792
737	if (scrollBar.state && OPTION (Opt_scrollBar_right))	793	if (scrollBar.state && option (Opt_scrollBar_right))
738	window_sb_x = szHint.width - sb_w;	794	window_sb_x = szHint.width - sb_w;
739		795
740	if (recalc_x)	796	if (recalc_x)
741	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	797	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742		798
…		…
765	ws.ws_xpixel = width;	821	ws.ws_xpixel = width;
766	ws.ws_ypixel = height;	822	ws.ws_ypixel = height;
767	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	823	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
768		824
769	#if 0	825	#if 0
770	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	826	// TIOCSWINSZ is supposed to do this automatically and correctly
771	if (cmd_pid) /* force through to the command */	827	if (cmd_pid) /* force through to the command */
772	kill (-cmd_pid, SIGWINCH);	828	kill (-cmd_pid, SIGWINCH);
773	#endif	829	#endif
774	}	830	}
775		831
…		…
804	delete fontset[0];	860	delete fontset[0];
805	fontset[0] = fs;	861	fontset[0] = fs;
806		862
807	prop = (*fs)[1]->properties ();	863	prop = (*fs)[1]->properties ();
808	prop.height += lineSpace;	864	prop.height += lineSpace;
		865
809	fs->set_prop (prop);	866	fs->set_prop (prop, false);
810		867
811	fwidth = prop.width;	868	fwidth = prop.width;
812	fheight = prop.height;	869	fheight = prop.height;
813	fbase = prop.ascent;	870	fbase = prop.ascent;
814		871
…		…
823	{	880	{
824	fontset[style] = fs = new rxvt_fontset (this);	881	fontset[style] = fs = new rxvt_fontset (this);
825	rxvt_fontprop prop2 = prop;	882	rxvt_fontprop prop2 = prop;
826		883
827	if (res)	884	if (res)
828	prop2.weight = prop2.slant = rxvt_fontprop::unset;	885	{
		886	fs->populate (res);
		887	fs->set_prop (prop2, false);
		888	}
829	else	889	else
830	{	890	{
831	res = fontset[0]->fontdesc;	891	fs->populate (fontset[0]->fontdesc);
832		892
833	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	893	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
834	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	894	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		895
		896	fs->set_prop (prop2, true);
835	}	897	}
836		898
837	fs->populate (res);
838	fs->set_prop (prop2);
839	}	899	}
840	#else	900	#else
841	fontset[style] = fontset[0];	901	fontset[style] = fontset[0];
842	#endif	902	#endif
843	}	903	}
…		…
845	if (parent[0])	905	if (parent[0])
846	{	906	{
847	resize_all_windows (0, 0, 0);	907	resize_all_windows (0, 0, 0);
848	scr_remap_chars ();	908	scr_remap_chars ();
849	scr_touch (true);	909	scr_touch (true);
850	}	910	}
851		911
852	return true;	912	return true;
853	}	913	}
854		914
		915	void
855	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	916	rxvt_term::set_string_property (Atom prop, const char *str, int len)
856	{	917	{
857	XChangeProperty (dpy, parent[0],	918	XChangeProperty (dpy, parent[0],
858	prop, XA_STRING, 8, PropModeReplace,	919	prop, XA_STRING, 8, PropModeReplace,
859	(const unsigned char *)str, len >= 0 ? len : strlen (str));	920	(const unsigned char *)str, len >= 0 ? len : strlen (str));
860	}	921	}
861		922
		923	void
862	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	924	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863	{	925	{
864	wchar_t *ws = rxvt_mbstowcs (str, len);	926	wchar_t *ws = rxvt_mbstowcs (str, len);
865	char *s = rxvt_wcstoutf8 (ws);	927	char *s = rxvt_wcstoutf8 (ws);
866		928
867	XChangeProperty (dpy, parent[0],	929	XChangeProperty (dpy, parent[0],
…		…
891	#if ENABLE_EWMH	953	#if ENABLE_EWMH
892	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	954	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893	#endif	955	#endif
894	}	956	}
895		957
		958	void
		959	rxvt_term::set_window_color (int idx, const char *color)
		960	{
896	#ifdef XTERM_COLOR_CHANGE	961	#ifdef XTERM_COLOR_CHANGE
897	void
898	rxvt_term::set_window_color (int idx, const char *color)
899	{
900	rxvt_color xcol;	962	rxvt_color xcol;
901	int i;	963	int i;
902		964
903	if (color == NULL \|\| *color == '\0')	965	if (color == NULL \|\| *color == '\0')
904	return;	966	return;
905		967
906	color = strdup (color);	968	color = strdup (color);
907	allocated.push_back ((void *)color);	969	allocated.push_back ((void *)color);
…		…
911	if (isdigit (*color))	973	if (isdigit (*color))
912	{	974	{
913	i = atoi (color);	975	i = atoi (color);
914		976
915	if (i >= 8 && i <= 15)	977	if (i >= 8 && i <= 15)
		978	{
916	{ /* bright colors */	979	/* bright colors */
917	i -= 8;
918	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	980	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
919	goto done;	981	goto done;
920	}	982	}
921		983
922	if (i >= 0 && i <= 7)	984	if (i >= 0 && i <= 7)
		985	{
923	{ /* normal colors */	986	/* normal colors */
924	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	987	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
925	goto done;	988	goto done;
926	}	989	}
927	}	990	}
928		991
…		…
933	* so just keep gobbling up the colormap	996	* so just keep gobbling up the colormap
934	*/	997	*/
935		998
936	pix_colors_focused[idx] = xcol;	999	pix_colors_focused[idx] = xcol;
937		1000
938	/* XSetWindowAttributes attr; */
939	/* Cursor cursor; */
940	done:	1001	done:
941
942	#if OFF_FOCUS_FADING
943	if (rs[Rs_fade])
944	{
945	rgba c;
946	pix_colors [Color_fade].get (c);
947	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948	}
949	#endif
950
951	/TODO: handle Color_BD, scrollbar background, etc. /	1002	/TODO: handle Color_BD, scrollbar background, etc. /
952		1003
		1004	update_fade_color (idx);
953	recolour_cursor ();	1005	recolour_cursor ();
954	scr_recolour ();	1006	scr_recolour ();
		1007	#endif /* XTERM_COLOR_CHANGE */
955	}	1008	}
956
957	#else
958	# define set_window_color (idx,color) ((void)0)
959	#endif /* XTERM_COLOR_CHANGE */
960		1009
961	void	1010	void
962	rxvt_term::recolour_cursor ()	1011	rxvt_term::recolour_cursor ()
963	{	1012	{
964	XColor fg, bg;	1013	XColor fg, bg;
…		…
980	*/	1029	*/
981	void	1030	void
982	rxvt_term::set_colorfgbg ()	1031	rxvt_term::set_colorfgbg ()
983	{	1032	{
984	unsigned int i;	1033	unsigned int i;
985	const char *xpmb = "\0";	1034	const char *xpmb = "";
986	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1035	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
987		1036
988	strcpy (fstr, "default");	1037	strcpy (fstr, "default");
989	strcpy (bstr, "default");	1038	strcpy (bstr, "default");
990	for (i = Color_Black; i <= Color_White; i++)	1039	for (i = Color_Black; i <= Color_White; i++)
…		…
996		1045
997	for (i = Color_Black; i <= Color_White; i++)	1046	for (i = Color_Black; i <= Color_White; i++)
998	if (pix_colors[Color_bg] == pix_colors[i])	1047	if (pix_colors[Color_bg] == pix_colors[i])
999	{	1048	{
1000	sprintf (bstr, "%d", (i - Color_Black));	1049	sprintf (bstr, "%d", (i - Color_Black));
1001	#ifdef XPM_BACKGROUND	1050	#ifdef BG_IMAGE_FROM_FILE
1002	xpmb = "default;";	1051	xpmb = "default;";
1003	#endif	1052	#endif
1004	break;	1053	break;
1005	}	1054	}
1006		1055
…		…
1102		1151
1103	XMoveResizeWindow (dpy, vt,	1152	XMoveResizeWindow (dpy, vt,
1104	window_vt_x, window_vt_y,	1153	window_vt_x, window_vt_y,
1105	width, height);	1154	width, height);
1106		1155
		1156	#ifdef HAVE_BG_PIXMAP
		1157	if (bgPixmap.window_size_sensitive ())
		1158	update_background ();
		1159	#endif
		1160
1107	scr_clear ();	1161	scr_clear ();
1108	#ifdef XPM_BACKGROUND
1109	resize_pixmap ();
1110	#endif
1111	}	1162	}
1112		1163
1113	if (fix_screen \|\| old_height == 0)	1164	if (fix_screen \|\| old_height == 0)
1114	scr_reset ();	1165	scr_reset ();
1115		1166
1116	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1167	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117	//scr_touch (false);	1168	//scr_touch (false);
1118		1169
1119	#ifdef XPM_BACKGROUND	1170	#ifdef HAVE_BG_PIXMAP
1120	if (pixmap)	1171	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1172	// if (bgPixmap.pixmap)
1121	scr_touch (false);	1173	// scr_touch (false);
1122	#endif	1174	#endif
1123		1175
1124	#ifdef USE_XIM	1176	#ifdef USE_XIM
1125	IMSetPosition ();	1177	IMSetPosition ();
1126	#endif	1178	#endif
…		…
1297	if (term->rs[Rs_imLocale])	1349	if (term->rs[Rs_imLocale])
1298	SET_LOCALE (term->locale);	1350	SET_LOCALE (term->locale);
1299	}	1351	}
1300	else	1352	else
1301	str = (void *)text->string.wide_char;	1353	str = (void *)text->string.wide_char;
1302		1354
1303	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1355	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304	DT_INT, call_data->caret,	1356	DT_INT, call_data->caret,
1305	DT_INT, call_data->chg_first,	1357	DT_INT, call_data->chg_first,
1306	DT_INT, call_data->chg_length,	1358	DT_INT, call_data->chg_length,
1307	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1359	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1626		1678
1627	if (input_style & XIMPreeditPosition)	1679	if (input_style & XIMPreeditPosition)
1628	{	1680	{
1629	im_set_size (preedit_rect);	1681	im_set_size (preedit_rect);
1630	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1682	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631		1683
1632	XSetICValues (Input_Context,	1684	XSetICValues (Input_Context,
1633	XNPreeditAttributes, preedit_attr, NULL);	1685	XNPreeditAttributes, preedit_attr, NULL);
1634	}	1686	}
1635	else	1687	else
1636	{	1688	{
…		…
1653	XFree (status_attr);	1705	XFree (status_attr);
1654	}	1706	}
1655		1707
1656	XFree (preedit_attr);	1708	XFree (preedit_attr);
1657	}	1709	}
1658	#endif /* USE_XIM */	1710	#endif /* USE_XIM */
		1711
		1712	void
		1713	rxvt_term::get_window_origin (int &x, int &y)
		1714	{
		1715	Window cr;
		1716	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1717	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1718	}
		1719
		1720	Pixmap
		1721	rxvt_term::get_pixmap_property (int prop_id)
		1722	{
		1723	if (prop_id > 0 && prop_id < NUM_XA)
		1724	if (xa[prop_id])
		1725	{
		1726	int aformat;
		1727	unsigned long nitems, bytes_after;
		1728	Atom atype;
		1729	unsigned char *prop = NULL;
		1730	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1731	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1732	&nitems, &bytes_after, &prop);
		1733	if (result == Success && prop && atype == XA_PIXMAP)
		1734	{
		1735	return (Pixmap )prop;
		1736	}
		1737	}
		1738	return None;
		1739	}
		1740
		1741	#ifdef HAVE_BG_PIXMAP
		1742	# if TRACE_PIXMAPS
		1743	# undef update_background
		1744	int rxvt_term::trace_update_background (const char *file, int line)
		1745	{
		1746	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1747	update_background ();
		1748	}
		1749	# endif
		1750
		1751	int
		1752	rxvt_term::update_background ()
		1753	{
		1754	bgPixmap.invalidate ();
		1755
		1756	/* no chance of real time refresh if we are blurring! */
		1757	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1758	bgPixmap.render ();
		1759	else
		1760	{
		1761	update_background_ev.stop ();
		1762
		1763	if (!bgPixmap.need_client_side_rendering())
		1764	update_background_ev.start (.05);
		1765	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1766	update_background_ev.start (.20); /* very slow !!! */
		1767	else
		1768	update_background_ev.start (.07);
		1769	}
		1770
		1771	return 0;
		1772	}
		1773
		1774	void
		1775	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1776	{
		1777	make_current ();
		1778	bgPixmap.render ();
		1779	refresh_check ();
		1780	}
		1781
		1782	#endif /* HAVE_BG_PIXMAP */
1659		1783
1660	/----------------------- end-of-file (C source) -----------------------/	1784	/----------------------- 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.224 by root, Mon Feb 20 22:42:00 2006 UTC vs. Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.224 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC