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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.230 by root, Sun Aug 27 10:10:25 2006 UTC vs.
Revision 1.306 by ayin, Mon Feb 18 09:58:04 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-2008 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
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	{
153	#if TRANSPARENT \|\| ENABLE_PERL	156	#if HAVE_BG_PIXMAP
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
155	#endif
156	#ifdef HAVE_SCROLLBARS
157	scrollbar_ev (this, &rxvt_term::x_cb),
158	#endif	158	#endif
159	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161	#endif	161	#endif
162	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
163	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164	#endif	164	#endif
165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167	#endif	167	#endif
168	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
169	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170	#endif	170	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
173	#endif	180	#endif
174	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
175	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176	#endif	183	#endif
177	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),
179	#endif
180	#ifndef NO_BELL	184	#ifndef NO_BELL
181	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182	#endif	186	#endif
183	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190	incr_ev (this, &rxvt_term::incr_cb)	194
191	{
192	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193		196
194	termlist.push_back (this);	197	termlist.push_back (this);
195		198
196	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
198	#endif	201	#endif
199	}	202	}
200		203
201	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
202	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
203	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
204	{	208	{
205	if (cmd_pid)	209	if (cmd_pid)
206	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
207		211
208	pty_ev.stop ();	212	pty_ev.stop ();
…		…
219	for (int i = RS_styleCount; --i; )	223	for (int i = RS_styleCount; --i; )
220	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
221	delete fontset[i];	225	delete fontset[i];
222	#endif	226	#endif
223	delete fontset[0];	227	delete fontset[0];
		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
224		232
225	if (display)	233	if (display)
226	{	234	{
227	selection_clear ();	235	selection_clear ();
228		236
…		…
268	pix_colors_unfocused [i].free (this);	276	pix_colors_unfocused [i].free (this);
269	#endif	277	#endif
270	}	278	}
271		279
272	clear ();	280	clear ();
273	}
274		281
275	delete [] pix_colors_focused;	282	display->flush (); /* ideally .put should do this */
276	#if OFF_FOCUS_FADING
277	delete [] pix_colors_unfocused;
278	#endif
279
280	displays.put (display);	283	displays.put (display);
		284	}
281		285
282	scr_release ();	286	scr_release ();
283		287
284	/* clear all resources */	288	/* clear all resources */
285	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
…		…
297	delete argv;	301	delete argv;
298		302
299	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
300	delete keyboard;	304	delete keyboard;
301	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
302	}	309	}
303		310
304	// child has exited, usually destroys	311	// child has exited, usually destroys
305	void	312	void
306	rxvt_term::child_cb (child_watcher &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
307	{	314	{
308	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	315	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309		316
310	cmd_pid = 0;	317	cmd_pid = 0;
311		318
312	if (!OPTION (Opt_hold))	319	if (!option (Opt_hold))
313	destroy ();	320	destroy ();
314	}	321	}
315		322
316	void	323	void
317	rxvt_term::destroy ()	324	rxvt_term::destroy ()
318	{	325	{
319	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
320	return;	327	return;
321		328
322	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		330
324	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
…		…
328	if (display)	335	if (display)
329	{	336	{
330	#if USE_XIM	337	#if USE_XIM
331	im_ev.stop (display);	338	im_ev.stop (display);
332	#endif	339	#endif
333	#if HAVE_SCROLLBARS
334	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
335	#endif
336	#if TRANSPARENT \|\| ENABLE_PERL	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
337	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
338	#endif	343	#endif
339	incr_ev.stop ();	344	incr_ev.stop ();
340	termwin_ev.stop (display);	345	termwin_ev.stop (display);
341	vt_ev.stop (display);	346	vt_ev.stop (display);
342	}	347	}
343		348
344	check_ev.stop ();	349	flush_ev.stop ();
345	pty_ev.stop ();	350	pty_ev.stop ();
346	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
347	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
348	#endif	353	#endif
349	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
357	#endif	362	#endif
358	#ifdef POINTER_BLANK	363	#ifdef POINTER_BLANK
359	pointer_ev.stop ();	364	pointer_ev.stop ();
360	#endif	365	#endif
361		366
362	destroy_ev.start (0);	367	destroy_ev.start ();
363	}	368	}
364		369
365	void	370	void
366	rxvt_term::destroy_cb (time_watcher &w)	371	rxvt_term::destroy_cb (ev::idle &w, int revents)
367	{	372	{
368	make_current ();	373	make_current ();
369		374
370	delete this;	375	delete this;
371	}	376	}
…		…
425	else	430	else
426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427	mesg, BUFSIZ);	432	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429	}	434	}
430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431	mesg, BUFSIZ);	436	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433	}	438	}
434	#endif	439	#endif
435		440
…		…
459	DisplayString (display));	464	DisplayString (display));
460	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
461	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
462	}	467	}
463		468
464	/----------------------------------------------------------------------/
465	bool
466	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{
468	this->envv = envv;
469
470	SET_R (this);
471	set_locale ("");
472	set_environ (envv); // few things in X do not call setlocale :(
473
474	if (!init_vars ())
475	return false;
476
477	init_secondary ();
478
479	const char **cmd_argv = init_resources (argc, argv);
480
481	#ifdef KEYSYM_RESOURCE
482	keyboard->register_done ();
483	#endif
484
485	#ifdef HAVE_SCROLLBARS
486	if (OPTION (Opt_scrollBar))
487	scrollBar.setIdle (); /* set existence for size calculations */
488	#endif
489
490	pty = ptytty::create ();
491
492	create_windows (argc, argv);
493
494	init_xlocale ();
495
496	scr_reset (); // initialize screen
497
498	#if 0
499	XSynchronize (dpy, True);
500	#endif
501
502	#ifdef HAVE_SCROLLBARS
503	if (OPTION (Opt_scrollBar))
504	resize_scrollbar (); /* create and map scrollbar */
505	#endif
506	#ifdef TRANSPARENT
507	if (OPTION (Opt_transparent))
508	{
509	XSelectInput (dpy, display->root, PropertyChangeMask);
510	check_our_parents ();
511	rootwin_ev.start (display, display->root);
512	}
513	#endif
514	#if ENABLE_PERL
515	rootwin_ev.start (display, display->root);
516	#endif
517
518	set_colorfgbg ();
519
520	init_command (cmd_argv);
521
522	free (cmd_argv);
523
524	if (pty->pty >= 0)
525	pty_ev.start (pty->pty, EVENT_READ);
526
527	check_ev.start ();
528
529	HOOK_INVOKE ((this, HOOK_START, DT_END));
530
531	#if ENABLE_XEMBED
532	if (rs[Rs_embed])
533	{
534	long info[2] = { 0, XEMBED_MAPPED };
535
536	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537	32, PropModeReplace, (unsigned char *)&info, 2);
538	}
539	#endif
540
541	XMapWindow (dpy, vt);
542	XMapWindow (dpy, parent[0]);
543
544	return true;
545	}
546
547	static struct sig_handlers	469	static struct sig_handlers
548	{	470	{
549	sig_watcher sw_term, sw_int;	471	ev::sig sw_term, sw_int;
550		472
551	/*	473	/*
552	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
553	*/	475	*/
554	void	476	void sig_term (ev::sig &w, int revents);
555	sig_term (sig_watcher &w)	477
		478	sig_handlers ()
556	{	479	{
557	rxvt_emergency_cleanup ();	480	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)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565	{
566	}	482	}
567	} sig_handlers;	483	} sig_handlers;
568		484
		485	void
		486	sig_handlers::sig_term (ev::sig &w, int revents)
		487	{
		488	rxvt_emergency_cleanup ();
		489	w.stop ();
		490	kill (getpid (), w.signum);
		491	}
		492
569	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
570		494
571	void	495	void
572	rxvt_init ()	496	rxvt_init ()
573	{	497	{
574	ptytty::init ();	498	ptytty::init ();
		499
		500	if (!ev_default_loop (0))
		501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575		502
576	rxvt_environ = environ;	503	rxvt_environ = environ;
577		504
578	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
579	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
580		507
581	sig_handlers.sw_term.start (SIGTERM);	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582	sig_handlers.sw_int.start (SIGINT);	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
583		510
584	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
585	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
586		513
587	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
589	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
590		517
591	XrmInitialize ();	518	XrmInitialize ();
592	}	519	}
593		520
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	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
631	/*	522	/*
632	* window size/position calculcations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	524	* if width/height are non-zero then override calculated width/height
634	*/	525	*/
635	void	526	void
636	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	528	{
638	short recalc_x, recalc_y;	529	short recalc_x, recalc_y;
639	int x, y, sb_w, flags;	530	int x, y, flags;
640	unsigned int w, h;	531	unsigned int w, h;
641	unsigned int max_width, max_height;	532	unsigned int max_width, max_height;
642		533
643	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
644	szHint.win_gravity = NorthWestGravity;	535	szHint.win_gravity = NorthWestGravity;
…		…
701	max_width = MAX_COLS * fwidth;	592	max_width = MAX_COLS * fwidth;
702	max_height = MAX_ROWS * fheight;	593	max_height = MAX_ROWS * fheight;
703		594
704	szHint.base_width = szHint.base_height = 2 * int_bwidth;	595	szHint.base_width = szHint.base_height = 2 * int_bwidth;
705		596
706	sb_w = 0;
707	window_vt_x = window_vt_y = int_bwidth;	597	window_vt_x = window_vt_y = int_bwidth;
708		598
709	if (scrollBar.state)	599	if (scrollBar.state)
710	{	600	{
711	sb_w = scrollbar_TotalWidth ();	601	int sb_w = scrollBar.total_width ();
712	szHint.base_width += sb_w;	602	szHint.base_width += sb_w;
713		603
714	if (!OPTION (Opt_scrollBar_right))	604	if (!option (Opt_scrollBar_right))
715	window_vt_x += sb_w;	605	window_vt_x += sb_w;
716	}	606	}
717		607
718	szHint.width_inc = fwidth;	608	szHint.width_inc = fwidth;
719	szHint.height_inc = fheight;	609	szHint.height_inc = fheight;
…		…
739	else	629	else
740	{	630	{
741	min_it (height, max_height);	631	min_it (height, max_height);
742	szHint.height = szHint.base_height + height;	632	szHint.height = szHint.base_height + height;
743	}	633	}
744
745	if (scrollBar.state && OPTION (Opt_scrollBar_right))
746	window_sb_x = szHint.width - sb_w;
747		634
748	if (recalc_x)	635	if (recalc_x)
749	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	636	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750		637
751	if (recalc_y)	638	if (recalc_y)
…		…
773	ws.ws_xpixel = width;	660	ws.ws_xpixel = width;
774	ws.ws_ypixel = height;	661	ws.ws_ypixel = height;
775	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	662	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
776		663
777	#if 0	664	#if 0
778	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	665	// TIOCSWINSZ is supposed to do this automatically and correctly
779	if (cmd_pid) /* force through to the command */	666	if (cmd_pid) /* force through to the command */
780	kill (-cmd_pid, SIGWINCH);	667	kill (-cmd_pid, SIGWINCH);
781	#endif	668	#endif
782	}	669	}
783		670
…		…
832	{	719	{
833	fontset[style] = fs = new rxvt_fontset (this);	720	fontset[style] = fs = new rxvt_fontset (this);
834	rxvt_fontprop prop2 = prop;	721	rxvt_fontprop prop2 = prop;
835		722
836	if (res)	723	if (res)
837	prop2.weight = prop2.slant = rxvt_fontprop::unset;	724	{
		725	fs->populate (res);
		726	fs->set_prop (prop2, false);
		727	}
838	else	728	else
839	{	729	{
840	res = fontset[0]->fontdesc;	730	fs->populate (fontset[0]->fontdesc);
841		731
842	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	732	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
843	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	733	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		734
		735	fs->set_prop (prop2, true);
844	}	736	}
845		737
846	fs->populate (res);
847	fs->set_prop (prop2, true);
848	}	738	}
849	#else	739	#else
850	fontset[style] = fontset[0];	740	fontset[style] = fontset[0];
851	#endif	741	#endif
852	}	742	}
…		…
854	if (parent[0])	744	if (parent[0])
855	{	745	{
856	resize_all_windows (0, 0, 0);	746	resize_all_windows (0, 0, 0);
857	scr_remap_chars ();	747	scr_remap_chars ();
858	scr_touch (true);	748	scr_touch (true);
859	}	749	}
860		750
861	return true;	751	return true;
862	}	752	}
863		753
		754	void
864	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	755	rxvt_term::set_string_property (Atom prop, const char *str, int len)
865	{	756	{
866	XChangeProperty (dpy, parent[0],	757	XChangeProperty (dpy, parent[0],
867	prop, XA_STRING, 8, PropModeReplace,	758	prop, XA_STRING, 8, PropModeReplace,
868	(const unsigned char *)str, len >= 0 ? len : strlen (str));	759	(const unsigned char *)str, len >= 0 ? len : strlen (str));
869	}	760	}
870		761
		762	void
871	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	763	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
872	{	764	{
873	wchar_t *ws = rxvt_mbstowcs (str, len);	765	wchar_t *ws = rxvt_mbstowcs (str, len);
874	char *s = rxvt_wcstoutf8 (ws);	766	char *s = rxvt_wcstoutf8 (ws);
875		767
876	XChangeProperty (dpy, parent[0],	768	XChangeProperty (dpy, parent[0],
…		…
900	#if ENABLE_EWMH	792	#if ENABLE_EWMH
901	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	793	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
902	#endif	794	#endif
903	}	795	}
904		796
		797	void
		798	rxvt_term::set_window_color (int idx, const char *color)
		799	{
905	#ifdef XTERM_COLOR_CHANGE	800	#ifdef XTERM_COLOR_CHANGE
906	void
907	rxvt_term::set_window_color (int idx, const char *color)
908	{
909	rxvt_color xcol;	801	rxvt_color xcol;
910	int i;	802
911
912	if (color == NULL \|\| *color == '\0')	803	if (color == NULL \|\| *color == '\0')
913	return;	804	return;
914		805
915	color = strdup (color);	806	color = strdup (color);
916	allocated.push_back ((void *)color);	807	allocated.push_back ((void *)color);
917	rs[Rs_color + idx] = color;	808	rs[Rs_color + idx] = color;
918		809
919	/* handle color aliases */	810	/* handle color aliases */
920	if (isdigit (*color))	811	if (isdigit (*color))
921	{	812	{
922	i = atoi (color);	813	int i = atoi (color);
923		814
924	if (i >= 8 && i <= 15)	815	if (i >= 8 && i <= 15)
		816	{
925	{ /* bright colors */	817	/* bright colors */
926	i -= 8;
927	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	818	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
928	goto done;	819	goto done;
929	}	820	}
930		821
931	if (i >= 0 && i <= 7)	822	if (i >= 0 && i <= 7)
		823	{
932	{ /* normal colors */	824	/* normal colors */
933	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	825	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
934	goto done;	826	goto done;
935	}	827	}
936	}	828	}
937		829
…		…
942	* so just keep gobbling up the colormap	834	* so just keep gobbling up the colormap
943	*/	835	*/
944		836
945	pix_colors_focused[idx] = xcol;	837	pix_colors_focused[idx] = xcol;
946		838
947	/* XSetWindowAttributes attr; */
948	/* Cursor cursor; */
949	done:	839	done:
950	/TODO: handle Color_BD, scrollbar background, etc. /	840	/TODO: handle Color_BD, scrollbar background, etc. /
951		841
952	update_fade_color (idx);	842	update_fade_color (idx);
953	recolour_cursor ();	843	recolour_cursor ();
954	scr_recolour ();	844	scr_recolour ();
		845	#endif /* XTERM_COLOR_CHANGE */
955	}	846	}
956
957	#else
958	# define set_window_color (idx,color) ((void)0)
959	#endif /* XTERM_COLOR_CHANGE */
960		847
961	void	848	void
962	rxvt_term::recolour_cursor ()	849	rxvt_term::recolour_cursor ()
963	{	850	{
964	XColor fg, bg;	851	XColor fg, bg;
…		…
980	*/	867	*/
981	void	868	void
982	rxvt_term::set_colorfgbg ()	869	rxvt_term::set_colorfgbg ()
983	{	870	{
984	unsigned int i;	871	unsigned int i;
985	const char *xpmb = "\0";	872	const char *xpmb = "";
986	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	873	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
987		874
988	strcpy (fstr, "default");	875	strcpy (fstr, "default");
989	strcpy (bstr, "default");	876	strcpy (bstr, "default");
990	for (i = Color_Black; i <= Color_White; i++)	877	for (i = Color_Black; i <= Color_White; i++)
…		…
996		883
997	for (i = Color_Black; i <= Color_White; i++)	884	for (i = Color_Black; i <= Color_White; i++)
998	if (pix_colors[Color_bg] == pix_colors[i])	885	if (pix_colors[Color_bg] == pix_colors[i])
999	{	886	{
1000	sprintf (bstr, "%d", (i - Color_Black));	887	sprintf (bstr, "%d", (i - Color_Black));
1001	#ifdef XPM_BACKGROUND	888	#ifdef BG_IMAGE_FROM_FILE
1002	xpmb = "default;";	889	xpmb = "default;";
1003	#endif	890	#endif
1004	break;	891	break;
1005	}	892	}
1006		893
…		…
1091	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	978	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1092		979
1093	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	980	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1094	{	981	{
1095	if (scrollBar.state)	982	if (scrollBar.state)
1096	{
1097	XMoveResizeWindow (dpy, scrollBar.win,
1098	window_sb_x, 0,
1099	scrollbar_TotalWidth (), szHint.height);
1100	resize_scrollbar ();	983	resize_scrollbar ();
1101	}
1102		984
1103	XMoveResizeWindow (dpy, vt,	985	XMoveResizeWindow (dpy, vt,
1104	window_vt_x, window_vt_y,	986	window_vt_x, window_vt_y,
1105	width, height);	987	width, height);
1106		988
		989	#ifdef HAVE_BG_PIXMAP
		990	if (bgPixmap.window_size_sensitive ())
		991	update_background ();
		992	#endif
		993
1107	scr_clear ();	994	scr_clear ();
1108	#ifdef XPM_BACKGROUND
1109	resize_pixmap ();
1110	#endif
1111	}	995	}
1112		996
1113	if (fix_screen \|\| old_height == 0)	997	if (fix_screen \|\| old_height == 0)
1114	scr_reset ();	998	scr_reset ();
1115		999
1116	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1000	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117	//scr_touch (false);	1001	//scr_touch (false);
1118		1002
1119	#ifdef XPM_BACKGROUND	1003	#ifdef HAVE_BG_PIXMAP
1120	if (pixmap)	1004	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1005	// if (bgPixmap.pixmap)
1121	scr_touch (false);	1006	// scr_touch (false);
1122	#endif	1007	#endif
1123		1008
1124	#ifdef USE_XIM	1009	#ifdef USE_XIM
1125	IMSetPosition ();	1010	IMSetPosition ();
1126	#endif	1011	#endif
…		…
1297	if (term->rs[Rs_imLocale])	1182	if (term->rs[Rs_imLocale])
1298	SET_LOCALE (term->locale);	1183	SET_LOCALE (term->locale);
1299	}	1184	}
1300	else	1185	else
1301	str = (void *)text->string.wide_char;	1186	str = (void *)text->string.wide_char;
1302		1187
1303	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1188	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304	DT_INT, call_data->caret,	1189	DT_INT, call_data->caret,
1305	DT_INT, call_data->chg_first,	1190	DT_INT, call_data->chg_first,
1306	DT_INT, call_data->chg_length,	1191	DT_INT, call_data->chg_length,
1307	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1192	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1626		1511
1627	if (input_style & XIMPreeditPosition)	1512	if (input_style & XIMPreeditPosition)
1628	{	1513	{
1629	im_set_size (preedit_rect);	1514	im_set_size (preedit_rect);
1630	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1515	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631		1516
1632	XSetICValues (Input_Context,	1517	XSetICValues (Input_Context,
1633	XNPreeditAttributes, preedit_attr, NULL);	1518	XNPreeditAttributes, preedit_attr, NULL);
1634	}	1519	}
1635	else	1520	else
1636	{	1521	{
…		…
1653	XFree (status_attr);	1538	XFree (status_attr);
1654	}	1539	}
1655		1540
1656	XFree (preedit_attr);	1541	XFree (preedit_attr);
1657	}	1542	}
1658	#endif /* USE_XIM */	1543	#endif /* USE_XIM */
		1544
		1545	void
		1546	rxvt_term::get_window_origin (int &x, int &y)
		1547	{
		1548	Window cr;
		1549	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1550	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1551	}
		1552
		1553	Pixmap
		1554	rxvt_term::get_pixmap_property (int prop_id)
		1555	{
		1556	if (prop_id > 0 && prop_id < NUM_XA)
		1557	if (xa[prop_id])
		1558	{
		1559	int aformat;
		1560	unsigned long nitems, bytes_after;
		1561	Atom atype;
		1562	unsigned char *prop = NULL;
		1563	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1564	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1565	&nitems, &bytes_after, &prop);
		1566	if (result == Success && prop && atype == XA_PIXMAP)
		1567	return (Pixmap )prop;
		1568	}
		1569
		1570	return None;
		1571	}
		1572
		1573	#ifdef HAVE_BG_PIXMAP
		1574	# if TRACE_PIXMAPS
		1575	# undef update_background
		1576	void
		1577	rxvt_term::trace_update_background (const char *file, int line)
		1578	{
		1579	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1580	update_background ();
		1581	}
		1582	# endif
		1583
		1584	void
		1585	rxvt_term::update_background ()
		1586	{
		1587	if (update_background_ev.is_active ())
		1588	return;
		1589
		1590	bgPixmap.invalidate ();
		1591
		1592	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1593
		1594	if (to_wait <= 0.)
		1595	bgPixmap.render ();
		1596	else
		1597	update_background_ev.start (to_wait);
		1598	}
		1599
		1600	void
		1601	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1602	{
		1603	make_current ();
		1604
		1605	update_background_ev.stop ();
		1606	bgPixmap.render ();
		1607	refresh_check ();
		1608	}
		1609
		1610	#endif /* HAVE_BG_PIXMAP */
1659		1611
1660	/----------------------- end-of-file (C source) -----------------------/	1612	/----------------------- 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.230 by root, Sun Aug 27 10:10:25 2006 UTC vs. Revision 1.306 by ayin, Mon Feb 18 09:58:04 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.230 by root, Sun Aug 27 10:10:25 2006 UTC vs.
Revision 1.306 by ayin, Mon Feb 18 09:58:04 2008 UTC