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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs. Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC