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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.252 by ayin, Mon Oct 8 07:05:23 2007 UTC vs.
Revision 1.307 by ayin, Tue Feb 19 10:47:03 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	{
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif	176	#endif
156	#if HAVE_BG_PIXMAP	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157	update_background_ev(this, &rxvt_term::update_background_cb),	178	#ifdef USE_XIM
158	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),
161	#endif
162	#ifdef CURSOR_BLINK
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	180	#endif
177	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	183	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	184	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	186	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	194
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
197	termlist.push_back (this);	197	termlist.push_back (this);
198		198
199	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	201	#endif
202	}	202	}
203		203
204	// 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.
205	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
206	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
207	{	208	{
208	if (cmd_pid)	209	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
210		211
211	pty_ev.stop ();	212	pty_ev.stop ();
…		…
222	for (int i = RS_styleCount; --i; )	223	for (int i = RS_styleCount; --i; )
223	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
224	delete fontset[i];	225	delete fontset[i];
225	#endif	226	#endif
226	delete fontset[0];	227	delete fontset[0];
		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
227		232
228	if (display)	233	if (display)
229	{	234	{
230	selection_clear ();	235	selection_clear ();
231		236
…		…
271	pix_colors_unfocused [i].free (this);	276	pix_colors_unfocused [i].free (this);
272	#endif	277	#endif
273	}	278	}
274		279
275	clear ();	280	clear ();
276	}
277		281
278	delete [] pix_colors_focused;	282	display->flush (); /* ideally .put should do this */
279	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;
281	#endif
282
283	displays.put (display);	283	displays.put (display);
		284	}
284		285
285	scr_release ();	286	scr_release ();
286		287
287	/* clear all resources */	288	/* clear all resources */
288	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
…		…
300	delete argv;	301	delete argv;
301		302
302	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	304	delete keyboard;
304	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
305	}	309	}
306		310
307	// child has exited, usually destroys	311	// child has exited, usually destroys
308	void	312	void
309	rxvt_term::child_cb (child_watcher &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
310	{	314	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	315	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		316
313	cmd_pid = 0;	317	cmd_pid = 0;
314		318
…		…
317	}	321	}
318		322
319	void	323	void
320	rxvt_term::destroy ()	324	rxvt_term::destroy ()
321	{	325	{
322	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
323	return;	327	return;
324		328
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		330
327	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
…		…
331	if (display)	335	if (display)
332	{	336	{
333	#if USE_XIM	337	#if USE_XIM
334	im_ev.stop (display);	338	im_ev.stop (display);
335	#endif	339	#endif
336	#if HAVE_SCROLLBARS
337	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
338	#endif
339	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
340	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
341	#endif	343	#endif
342	incr_ev.stop ();	344	incr_ev.stop ();
343	termwin_ev.stop (display);	345	termwin_ev.stop (display);
344	vt_ev.stop (display);	346	vt_ev.stop (display);
345	}	347	}
346		348
347	check_ev.stop ();	349	flush_ev.stop ();
348	pty_ev.stop ();	350	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
351	#endif	353	#endif
352	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
360	#endif	362	#endif
361	#ifdef POINTER_BLANK	363	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	364	pointer_ev.stop ();
363	#endif	365	#endif
364		366
365	destroy_ev.start (0);	367	destroy_ev.start ();
366	}	368	}
367		369
368	void	370	void
369	rxvt_term::destroy_cb (time_watcher &w)	371	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	372	{
371	make_current ();	373	make_current ();
372		374
373	delete this;	375	delete this;
374	}	376	}
…		…
428	else	430	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	432	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	434	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	436	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	438	}
437	#endif	439	#endif
438		440
…		…
462	DisplayString (display));	464	DisplayString (display));
463	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
465	}	467	}
466		468
467	/----------------------------------------------------------------------/
468	bool
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{
471	this->envv = envv;
472
473	SET_R (this);
474	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(
476
477	if (!init_vars ())
478	return false;
479
480	init_secondary ();
481
482	const char **cmd_argv = init_resources (argc, argv);
483
484	#ifdef KEYSYM_RESOURCE
485	keyboard->register_done ();
486	#endif
487
488	#ifdef HAVE_SCROLLBARS
489	if (option (Opt_scrollBar))
490	scrollBar.setIdle (); /* set existence for size calculations */
491	#endif
492
493	pty = ptytty::create ();
494
495	create_windows (argc, argv);
496
497	init_xlocale ();
498
499	scr_reset (); // initialize screen
500
501	#if 0
502	XSynchronize (dpy, True);
503	#endif
504
505	#ifdef HAVE_SCROLLBARS
506	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */
508	#endif
509	#ifdef HAVE_BG_PIXMAP
510	{
511	bgPixmap.set_target (this);
512
513	#ifdef ENABLE_TRANSPARENCY
514	if (option (Opt_transparent))
515	{
516	bgPixmap.set_transparent ();
517	#ifdef HAVE_AFTERIMAGE
518	if (rs [Rs_blurradius])
519	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520	#endif
521	if (ISSET_PIXCOLOR (Color_tint))
522	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523	if (rs [Rs_shade])
524	bgPixmap.set_shade (rs [Rs_shade]);
525
526	bgPixmap.set_root_pixmap ();
527	XSelectInput (dpy, display->root, PropertyChangeMask);
528	rootwin_ev.start (display, display->root);
529	}
530	#endif
531
532	#ifdef BG_IMAGE_FROM_FILE
533	if (rs[Rs_backgroundPixmap] != NULL)
534	{
535	const char *p = rs[Rs_backgroundPixmap];
536
537	if ((p = strchr (p, ';')) != NULL)
538	{
539	p++;
540	bgPixmap.set_geometry (p);
541	}
542	else
543	bgPixmap.set_defaultGeometry ();
544
545	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546	if (!bgPixmap.window_position_sensitive ())
547	update_background ();
548	}
549	#endif
550	}
551	#endif
552
553	#if ENABLE_PERL
554	rootwin_ev.start (display, display->root);
555	#endif
556
557	set_colorfgbg ();
558
559	init_command (cmd_argv);
560
561	free (cmd_argv);
562
563	if (pty->pty >= 0)
564	pty_ev.start (pty->pty, EVENT_READ);
565
566	check_ev.start ();
567
568	HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570	#if ENABLE_XEMBED
571	if (rs[Rs_embed])
572	{
573	long info[2] = { 0, XEMBED_MAPPED };
574
575	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576	32, PropModeReplace, (unsigned char *)&info, 2);
577	}
578	#endif
579
580	XMapWindow (dpy, vt);
581	XMapWindow (dpy, parent[0]);
582
583	return true;
584	}
585
586	static struct sig_handlers	469	static struct sig_handlers
587	{	470	{
588	sig_watcher sw_term, sw_int;	471	ev::sig sw_term, sw_int;
589		472
590	/*	473	/*
591	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
592	*/	475	*/
593	void	476	void sig_term (ev::sig &w, int revents);
594	sig_term (sig_watcher &w)	477
		478	sig_handlers ()
595	{	479	{
596	rxvt_emergency_cleanup ();	480	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597	signal (w.signum, SIG_DFL);
598	kill (getpid (), w.signum);
599	}
600
601	sig_handlers ()
602	: sw_term (this, &sig_handlers::sig_term),
603	sw_int (this, &sig_handlers::sig_term)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604	{
605	}	482	}
606	} sig_handlers;	483	} sig_handlers;
607		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
608	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
609		494
610	void	495	void
611	rxvt_init ()	496	rxvt_init ()
612	{	497	{
613	ptytty::init ();	498	ptytty::init ();
		499
		500	if (!ev_default_loop (0))
		501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
614		502
615	rxvt_environ = environ;	503	rxvt_environ = environ;
616		504
617	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
618	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
619		507
620	sig_handlers.sw_term.start (SIGTERM);	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621	sig_handlers.sw_int.start (SIGINT);	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
622		510
623	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
624	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
625		513
626	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627	// TODO: handle this with exceptions and tolerate the memory loss	515	// TODO: handle this with exceptions and tolerate the memory loss
628	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
629		517
630	XrmInitialize ();	518	XrmInitialize ();
631	}
632
633	/* ------------------------------------------------------------------------- *
634	* MEMORY ALLOCATION WRAPPERS *
635	* ------------------------------------------------------------------------- */
636	void *
637	rxvt_malloc (size_t size)
638	{
639	void *p = malloc (size);
640
641	if (!p)
642	rxvt_fatal ("memory allocation failure. aborting.\n");
643
644	return p;
645	}
646
647	void *
648	rxvt_calloc (size_t number, size_t size)
649	{
650	void *p = calloc (number, size);
651
652	if (!p)
653	rxvt_fatal ("memory allocation failure. aborting.\n");
654
655	return p;
656	}
657
658	void *
659	rxvt_realloc (void *ptr, size_t size)
660	{
661	void *p = realloc (ptr, size);
662
663	if (!p)
664	rxvt_fatal ("memory allocation failure. aborting.\n");
665
666	return p;
667	}	519	}
668		520
669	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
670	/*	522	/*
671	* window size/position calculations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
…		…
673	*/	525	*/
674	void	526	void
675	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
676	{	528	{
677	short recalc_x, recalc_y;	529	short recalc_x, recalc_y;
678	int x, y, sb_w, flags;	530	int x, y, flags;
679	unsigned int w, h;	531	unsigned int w, h;
680	unsigned int max_width, max_height;	532	unsigned int max_width, max_height;
681		533
682	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
683	szHint.win_gravity = NorthWestGravity;	535	szHint.win_gravity = NorthWestGravity;
…		…
740	max_width = MAX_COLS * fwidth;	592	max_width = MAX_COLS * fwidth;
741	max_height = MAX_ROWS * fheight;	593	max_height = MAX_ROWS * fheight;
742		594
743	szHint.base_width = szHint.base_height = 2 * int_bwidth;	595	szHint.base_width = szHint.base_height = 2 * int_bwidth;
744		596
745	sb_w = 0;
746	window_vt_x = window_vt_y = int_bwidth;	597	window_vt_x = window_vt_y = int_bwidth;
747		598
748	if (scrollBar.state)	599	if (scrollBar.state)
749	{	600	{
750	sb_w = scrollbar_TotalWidth ();	601	int sb_w = scrollBar.total_width ();
751	szHint.base_width += sb_w;	602	szHint.base_width += sb_w;
752		603
753	if (!option (Opt_scrollBar_right))	604	if (!option (Opt_scrollBar_right))
754	window_vt_x += sb_w;	605	window_vt_x += sb_w;
755	}	606	}
…		…
778	else	629	else
779	{	630	{
780	min_it (height, max_height);	631	min_it (height, max_height);
781	szHint.height = szHint.base_height + height;	632	szHint.height = szHint.base_height + height;
782	}	633	}
783
784	if (scrollBar.state && option (Opt_scrollBar_right))
785	window_sb_x = szHint.width - sb_w;
786		634
787	if (recalc_x)	635	if (recalc_x)
788	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	636	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789		637
790	if (recalc_y)	638	if (recalc_y)
…		…
812	ws.ws_xpixel = width;	660	ws.ws_xpixel = width;
813	ws.ws_ypixel = height;	661	ws.ws_ypixel = height;
814	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	662	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
815		663
816	#if 0	664	#if 0
817	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	665	// TIOCSWINSZ is supposed to do this automatically and correctly
818	if (cmd_pid) /* force through to the command */	666	if (cmd_pid) /* force through to the command */
819	kill (-cmd_pid, SIGWINCH);	667	kill (-cmd_pid, SIGWINCH);
820	#endif	668	#endif
821	}	669	}
822		670
…		…
896	if (parent[0])	744	if (parent[0])
897	{	745	{
898	resize_all_windows (0, 0, 0);	746	resize_all_windows (0, 0, 0);
899	scr_remap_chars ();	747	scr_remap_chars ();
900	scr_touch (true);	748	scr_touch (true);
901	}	749	}
902		750
903	return true;	751	return true;
904	}	752	}
905		753
		754	void
906	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)
907	{	756	{
908	XChangeProperty (dpy, parent[0],	757	XChangeProperty (dpy, parent[0],
909	prop, XA_STRING, 8, PropModeReplace,	758	prop, XA_STRING, 8, PropModeReplace,
910	(const unsigned char *)str, len >= 0 ? len : strlen (str));	759	(const unsigned char *)str, len >= 0 ? len : strlen (str));
911	}	760	}
912		761
		762	void
913	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)
914	{	764	{
915	wchar_t *ws = rxvt_mbstowcs (str, len);	765	wchar_t *ws = rxvt_mbstowcs (str, len);
916	char *s = rxvt_wcstoutf8 (ws);	766	char *s = rxvt_wcstoutf8 (ws);
917		767
918	XChangeProperty (dpy, parent[0],	768	XChangeProperty (dpy, parent[0],
…		…
947	void	797	void
948	rxvt_term::set_window_color (int idx, const char *color)	798	rxvt_term::set_window_color (int idx, const char *color)
949	{	799	{
950	#ifdef XTERM_COLOR_CHANGE	800	#ifdef XTERM_COLOR_CHANGE
951	rxvt_color xcol;	801	rxvt_color xcol;
952	int i;	802
953
954	if (color == NULL \|\| *color == '\0')	803	if (color == NULL \|\| *color == '\0')
955	return;	804	return;
956		805
957	color = strdup (color);	806	color = strdup (color);
958	allocated.push_back ((void *)color);	807	allocated.push_back ((void *)color);
959	rs[Rs_color + idx] = color;	808	rs[Rs_color + idx] = color;
960		809
961	/* handle color aliases */	810	/* handle color aliases */
962	if (isdigit (*color))	811	if (isdigit (*color))
963	{	812	{
964	i = atoi (color);	813	int i = atoi (color);
965		814
966	if (i >= 8 && i <= 15)	815	if (i >= 8 && i <= 15)
		816	{
967	{ /* bright colors */	817	/* bright colors */
968	i -= 8;
969	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	818	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
970	goto done;	819	goto done;
971	}	820	}
972		821
973	if (i >= 0 && i <= 7)	822	if (i >= 0 && i <= 7)
		823	{
974	{ /* normal colors */	824	/* normal colors */
975	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	825	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976	goto done;	826	goto done;
977	}	827	}
978	}	828	}
979		829
…		…
984	* so just keep gobbling up the colormap	834	* so just keep gobbling up the colormap
985	*/	835	*/
986		836
987	pix_colors_focused[idx] = xcol;	837	pix_colors_focused[idx] = xcol;
988		838
989	/* XSetWindowAttributes attr; */
990	/* Cursor cursor; */
991	done:	839	done:
992	/TODO: handle Color_BD, scrollbar background, etc. /	840	/TODO: handle Color_BD, scrollbar background, etc. /
993		841
994	update_fade_color (idx);	842	update_fade_color (idx);
995	recolour_cursor ();	843	recolour_cursor ();
996	scr_recolour ();	844	scr_recolour ();
997	#endif /* XTERM_COLOR_CHANGE */	845	#endif /* XTERM_COLOR_CHANGE */
998	}	846	}
999		847
1000	void	848	void
1001	rxvt_term::recolour_cursor ()	849	rxvt_term::recolour_cursor ()
1002	{	850	{
…		…
1019	*/	867	*/
1020	void	868	void
1021	rxvt_term::set_colorfgbg ()	869	rxvt_term::set_colorfgbg ()
1022	{	870	{
1023	unsigned int i;	871	unsigned int i;
1024	const char *xpmb = "\0";	872	const char *xpmb = "";
1025	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	873	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1026		874
1027	strcpy (fstr, "default");	875	strcpy (fstr, "default");
1028	strcpy (bstr, "default");	876	strcpy (bstr, "default");
1029	for (i = Color_Black; i <= Color_White; i++)	877	for (i = Color_Black; i <= Color_White; i++)
…		…
1130	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	978	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1131		979
1132	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	980	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1133	{	981	{
1134	if (scrollBar.state)	982	if (scrollBar.state)
1135	{	983	scrollBar.resize ();
1136	XMoveResizeWindow (dpy, scrollBar.win,
1137	window_sb_x, 0,
1138	scrollbar_TotalWidth (), szHint.height);
1139	resize_scrollbar ();
1140	}
1141		984
1142	XMoveResizeWindow (dpy, vt,	985	XMoveResizeWindow (dpy, vt,
1143	window_vt_x, window_vt_y,	986	window_vt_x, window_vt_y,
1144	width, height);	987	width, height);
1145		988
…		…
1339	if (term->rs[Rs_imLocale])	1182	if (term->rs[Rs_imLocale])
1340	SET_LOCALE (term->locale);	1183	SET_LOCALE (term->locale);
1341	}	1184	}
1342	else	1185	else
1343	str = (void *)text->string.wide_char;	1186	str = (void *)text->string.wide_char;
1344		1187
1345	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1188	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1346	DT_INT, call_data->caret,	1189	DT_INT, call_data->caret,
1347	DT_INT, call_data->chg_first,	1190	DT_INT, call_data->chg_first,
1348	DT_INT, call_data->chg_length,	1191	DT_INT, call_data->chg_length,
1349	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,
…		…
1668		1511
1669	if (input_style & XIMPreeditPosition)	1512	if (input_style & XIMPreeditPosition)
1670	{	1513	{
1671	im_set_size (preedit_rect);	1514	im_set_size (preedit_rect);
1672	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1515	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1673		1516
1674	XSetICValues (Input_Context,	1517	XSetICValues (Input_Context,
1675	XNPreeditAttributes, preedit_attr, NULL);	1518	XNPreeditAttributes, preedit_attr, NULL);
1676	}	1519	}
1677	else	1520	else
1678	{	1521	{
…		…
1695	XFree (status_attr);	1538	XFree (status_attr);
1696	}	1539	}
1697		1540
1698	XFree (preedit_attr);	1541	XFree (preedit_attr);
1699	}	1542	}
1700	#endif /* USE_XIM */	1543	#endif /* USE_XIM */
1701		1544
1702	void	1545	void
1703	rxvt_term::get_window_origin (int &x, int &y)	1546	rxvt_term::get_window_origin (int &x, int &y)
1704	{	1547	{
1705	Window cr;	1548	Window cr;
1706	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1549	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1707	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1550	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1708	}	1551	}
1709		1552
1710	Pixmap	1553	Pixmap
1711	rxvt_term::get_pixmap_property (int prop_id)	1554	rxvt_term::get_pixmap_property (int prop_id)
1712	{	1555	{
…		…
1719	unsigned char *prop = NULL;	1562	unsigned char *prop = NULL;
1720	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1563	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1721	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1564	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1722	&nitems, &bytes_after, &prop);	1565	&nitems, &bytes_after, &prop);
1723	if (result == Success && prop && atype == XA_PIXMAP)	1566	if (result == Success && prop && atype == XA_PIXMAP)
1724	{
1725	return (Pixmap )prop;	1567	return (Pixmap )prop;
1726	}
1727	}	1568	}
		1569
1728	return None;	1570	return None;
1729	}	1571	}
1730		1572
1731	#ifdef HAVE_BG_PIXMAP	1573	#ifdef HAVE_BG_PIXMAP
1732	int	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
1733	rxvt_term::update_background ()	1585	rxvt_term::update_background ()
1734	{	1586	{
		1587	if (update_background_ev.is_active ())
		1588	return;
		1589
1735	bgPixmap.invalidate ();	1590	bgPixmap.invalidate ();
1736		1591
1737	/* no chance of real time refresh if we are blurring ! */	1592	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1738	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1593
		1594	if (to_wait <= 0.)
1739	bgPixmap.render ();	1595	bgPixmap.render ();
1740	else	1596	else
1741	{	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
1742	update_background_ev.stop ();	1605	update_background_ev.stop ();
1743	if (!bgPixmap.need_client_side_rendering())
1744	update_background_ev.start (NOW + .05);
1745	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1746	update_background_ev.start (NOW + .2); /* very slow !!! */
1747	else
1748	update_background_ev.start (NOW + .07);
1749	}
1750	return 0;
1751	}
1752
1753	void
1754	rxvt_term::update_background_cb (time_watcher &w)
1755	{
1756	bgPixmap.render ();	1606	bgPixmap.render ();
		1607	refresh_check ();
1757	}	1608	}
1758		1609
1759	#endif /* HAVE_BG_PIXMAP */	1610	#endif /* HAVE_BG_PIXMAP */
1760		1611
1761	/----------------------- 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.252 by ayin, Mon Oct 8 07:05:23 2007 UTC vs. Revision 1.307 by ayin, Tue Feb 19 10:47:03 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.252 by ayin, Mon Oct 8 07:05:23 2007 UTC vs.
Revision 1.307 by ayin, Tue Feb 19 10:47:03 2008 UTC