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

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