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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs. Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC