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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.291 by root, Mon Dec 24 06:51:37 2007 UTC

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.291 by root, Mon Dec 24 06:51:37 2007 UTC