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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.227 by root, Fri Jul 28 17:16:42 2006 UTC vs.
Revision 1.311 by root, Tue Nov 4 13:28:40 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"
…		…
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	{
61	int len = strlen (locale) + 1;	64	int size = strlen (locale) + 1;
62		65
63	if (len > sizeof (curlocale))	66	if (size > sizeof (curlocale))
64	rxvt_fatal ("locale string too long, aborting.\n");	67	rxvt_fatal ("locale string too long, aborting.\n");
65		68
66	if (!locale \|\| !memcmp (locale, curlocale, len))	69	if (!locale \|\| !memcmp (locale, curlocale, size))
67	return false;	70	return false;
68		71
69	memcpy (curlocale, locale, len);	72	memcpy (curlocale, locale, size);
70	setlocale (LC_CTYPE, curlocale);	73	setlocale (LC_CTYPE, curlocale);
71	return true;	74	return true;
72	}	75	}
73		76
74	void	77	void
…		…
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 ();
…		…
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];
224		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232	#ifdef HAVE_AFTERIMAGE
		233	if (asv)
		234	destroy_asvisual (asv, 0);
		235	if (asimman)
		236	destroy_image_manager (asimman, 0);
		237	#endif
		238
225	if (display)	239	if (display)
226	{	240	{
227	selection_clear ();	241	selection_clear ();
228		242
229	#ifdef USE_XIM	243	#ifdef USE_XIM
230	im_destroy ();	244	im_destroy ();
231	#endif	245	#endif
232	#ifdef XTERM_SCROLLBAR	246	scrollBar.destroy ();
233	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
234	if (ShadowGC) XFreeGC (dpy, ShadowGC);
235	#endif
236	#ifdef PLAIN_SCROLLBAR
237	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
238	#endif
239	#ifdef NEXT_SCROLLBAR
240	if (blackGC) XFreeGC (dpy, blackGC);
241	if (whiteGC) XFreeGC (dpy, whiteGC);
242	if (grayGC) XFreeGC (dpy, grayGC);
243	if (darkGC) XFreeGC (dpy, darkGC);
244	if (stippleGC) XFreeGC (dpy, stippleGC);
245	if (dimple) XFreePixmap (dpy, dimple);
246	if (upArrow) XFreePixmap (dpy, upArrow);
247	if (downArrow) XFreePixmap (dpy, downArrow);
248	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
249	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
250	#endif
251	#ifdef RXVT_SCROLLBAR
252	if (topShadowGC) XFreeGC (dpy, topShadowGC);
253	if (botShadowGC) XFreeGC (dpy, botShadowGC);
254	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
255	#endif
256	if (gc) XFreeGC (dpy, gc);	247	if (gc) XFreeGC (dpy, gc);
257		248
258	delete drawable;	249	delete drawable;
259	// destroy all windows	250	// destroy all windows
260	if (parent[0])	251	if (parent[0])
…		…
268	pix_colors_unfocused [i].free (this);	259	pix_colors_unfocused [i].free (this);
269	#endif	260	#endif
270	}	261	}
271		262
272	clear ();	263	clear ();
273	}
274		264
275	delete pix_colors_focused;	265	display->flush (); /* ideally .put should do this */
276	#if OFF_FOCUS_FADING
277	delete pix_colors_unfocused;
278	#endif
279
280	displays.put (display);	266	displays.put (display);
		267	}
281		268
282	scr_release ();	269	scr_release ();
283		270
284	/* clear all resources */	271	/* clear all resources */
285	for (int i = 0; i < allocated.size (); i++)	272	for (int i = 0; i < allocated.size (); i++)
…		…
297	delete argv;	284	delete argv;
298		285
299	#ifdef KEYSYM_RESOURCE	286	#ifdef KEYSYM_RESOURCE
300	delete keyboard;	287	delete keyboard;
301	#endif	288	#endif
		289	#ifndef NO_RESOURCES
		290	XrmDestroyDatabase (option_db);
		291	#endif
302	}	292	}
303		293
304	// child has exited, usually destroys	294	// child has exited, usually destroys
305	void	295	void
306	rxvt_term::child_cb (child_watcher &w, int status)	296	rxvt_term::child_cb (ev::child &w, int status)
307	{	297	{
308	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	298	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309		299
310	cmd_pid = 0;	300	cmd_pid = 0;
311		301
312	if (!OPTION (Opt_hold))	302	if (!option (Opt_hold))
313	destroy ();	303	destroy ();
314	}	304	}
315		305
316	void	306	void
317	rxvt_term::destroy ()	307	rxvt_term::destroy ()
318	{	308	{
319	if (destroy_ev.active)	309	if (destroy_ev.is_active ())
320	return;	310	return;
321		311
322	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	312	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		313
324	#if ENABLE_OVERLAY	314	#if ENABLE_OVERLAY
…		…
328	if (display)	318	if (display)
329	{	319	{
330	#if USE_XIM	320	#if USE_XIM
331	im_ev.stop (display);	321	im_ev.stop (display);
332	#endif	322	#endif
333	#if HAVE_SCROLLBARS
334	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
335	#endif
336	#if TRANSPARENT \|\| ENABLE_PERL	324	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
337	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
338	#endif	326	#endif
339	incr_ev.stop ();	327	incr_ev.stop ();
340	termwin_ev.stop (display);	328	termwin_ev.stop (display);
341	vt_ev.stop (display);	329	vt_ev.stop (display);
342	}	330	}
343		331
344	check_ev.stop ();	332	flush_ev.stop ();
345	pty_ev.stop ();	333	pty_ev.stop ();
346	#ifdef CURSOR_BLINK	334	#ifdef CURSOR_BLINK
347	cursor_blink_ev.stop ();	335	cursor_blink_ev.stop ();
348	#endif	336	#endif
349	#ifdef TEXT_BLINK	337	#ifdef TEXT_BLINK
…		…
357	#endif	345	#endif
358	#ifdef POINTER_BLANK	346	#ifdef POINTER_BLANK
359	pointer_ev.stop ();	347	pointer_ev.stop ();
360	#endif	348	#endif
361		349
362	destroy_ev.start (0);	350	destroy_ev.start ();
363	}	351	}
364		352
365	void	353	void
366	rxvt_term::destroy_cb (time_watcher &w)	354	rxvt_term::destroy_cb (ev::idle &w, int revents)
367	{	355	{
368	make_current ();	356	make_current ();
369		357
370	delete this;	358	delete this;
371	}	359	}
…		…
425	else	413	else
426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	414	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427	mesg, BUFSIZ);	415	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429	}	417	}
430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	418	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431	mesg, BUFSIZ);	419	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433	}	421	}
434	#endif	422	#endif
435		423
…		…
459	DisplayString (display));	447	DisplayString (display));
460	rxvt_emergency_cleanup ();	448	rxvt_emergency_cleanup ();
461	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
462	}	450	}
463		451
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	452	static struct sig_handlers
548	{	453	{
549	sig_watcher sw_term, sw_int;	454	ev::sig sw_term, sw_int;
550		455
551	/*	456	/*
552	* Catch a fatal signal and tidy up before quitting	457	* Catch a fatal signal and tidy up before quitting
553	*/	458	*/
554	void	459	void sig_term (ev::sig &w, int revents);
555	sig_term (sig_watcher &w)	460
		461	sig_handlers ()
556	{	462	{
557	rxvt_emergency_cleanup ();	463	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)	464	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565	{
566	}	465	}
567	} sig_handlers;	466	} sig_handlers;
568		467
		468	void
		469	sig_handlers::sig_term (ev::sig &w, int revents)
		470	{
		471	rxvt_emergency_cleanup ();
		472	w.stop ();
		473	kill (getpid (), w.signum);
		474	}
		475
569	char **rxvt_environ; // startup environment	476	char **rxvt_environ; // startup environment
570		477
571	void	478	void
572	rxvt_init ()	479	rxvt_init ()
573	{	480	{
574	ptytty::init ();	481	ptytty::init ();
		482
		483	if (!ev_default_loop (0))
		484	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575		485
576	rxvt_environ = environ;	486	rxvt_environ = environ;
577		487
578	signal (SIGHUP, SIG_IGN);	488	signal (SIGHUP, SIG_IGN);
579	signal (SIGPIPE, SIG_IGN);	489	signal (SIGPIPE, SIG_IGN);
580		490
581	sig_handlers.sw_term.start (SIGTERM);	491	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582	sig_handlers.sw_int.start (SIGINT);	492	sig_handlers.sw_int.start (SIGINT); ev_unref ();
583		493
584	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	494	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
585	/* signal (SIGURG, SIG_DFL); */	495	/* signal (SIGURG, SIG_DFL); */
586		496
587	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	497	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
589	XSetIOErrorHandler (rxvt_xioerror_handler);	499	XSetIOErrorHandler (rxvt_xioerror_handler);
590		500
591	XrmInitialize ();	501	XrmInitialize ();
592	}	502	}
593		503
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	/----------------------------------------------------------------------/	504	/----------------------------------------------------------------------/
631	/*	505	/*
632	* window size/position calculcations for XSizeHint and other storage.	506	* window size/position calculations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	507	* if width/height are non-zero then override calculated width/height
634	*/	508	*/
635	void	509	void
636	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	510	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	511	{
638	short recalc_x, recalc_y;	512	short recalc_x, recalc_y;
639	int x, y, sb_w, flags;	513	int x, y, flags;
640	unsigned int w, h;	514	unsigned int w, h;
641	unsigned int max_width, max_height;	515	unsigned int max_width, max_height;
642		516
643	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	517	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
644	szHint.win_gravity = NorthWestGravity;	518	szHint.win_gravity = NorthWestGravity;
…		…
654	if (rs[Rs_geometry])	528	if (rs[Rs_geometry])
655	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	529	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
656		530
657	if (flags & WidthValue)	531	if (flags & WidthValue)
658	{	532	{
		533	if (!w)
		534	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		535
659	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	536	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
660	szHint.flags \|= USSize;	537	szHint.flags \|= USSize;
661	}	538	}
662		539
663	if (flags & HeightValue)	540	if (flags & HeightValue)
664	{	541	{
		542	if (!h)
		543	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		544
665	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	545	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
666	szHint.flags \|= USSize;	546	szHint.flags \|= USSize;
667	}	547	}
668		548
669	if (flags & XValue)	549	if (flags & XValue)
670	{	550	{
…		…
701	max_width = MAX_COLS * fwidth;	581	max_width = MAX_COLS * fwidth;
702	max_height = MAX_ROWS * fheight;	582	max_height = MAX_ROWS * fheight;
703		583
704	szHint.base_width = szHint.base_height = 2 * int_bwidth;	584	szHint.base_width = szHint.base_height = 2 * int_bwidth;
705		585
706	sb_w = 0;
707	window_vt_x = window_vt_y = int_bwidth;	586	window_vt_x = window_vt_y = int_bwidth;
708		587
709	if (scrollBar.state)	588	if (scrollBar.state)
710	{	589	{
711	sb_w = scrollbar_TotalWidth ();	590	int sb_w = scrollBar.total_width ();
712	szHint.base_width += sb_w;	591	szHint.base_width += sb_w;
713		592
714	if (!OPTION (Opt_scrollBar_right))	593	if (!option (Opt_scrollBar_right))
715	window_vt_x += sb_w;	594	window_vt_x += sb_w;
716	}	595	}
717		596
718	szHint.width_inc = fwidth;	597	szHint.width_inc = fwidth;
719	szHint.height_inc = fheight;	598	szHint.height_inc = fheight;
…		…
739	else	618	else
740	{	619	{
741	min_it (height, max_height);	620	min_it (height, max_height);
742	szHint.height = szHint.base_height + height;	621	szHint.height = szHint.base_height + height;
743	}	622	}
744
745	if (scrollBar.state && OPTION (Opt_scrollBar_right))
746	window_sb_x = szHint.width - sb_w;
747		623
748	if (recalc_x)	624	if (recalc_x)
749	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	625	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750		626
751	if (recalc_y)	627	if (recalc_y)
…		…
773	ws.ws_xpixel = width;	649	ws.ws_xpixel = width;
774	ws.ws_ypixel = height;	650	ws.ws_ypixel = height;
775	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	651	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
776		652
777	#if 0	653	#if 0
778	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	654	// TIOCSWINSZ is supposed to do this automatically and correctly
779	if (cmd_pid) /* force through to the command */	655	if (cmd_pid) /* force through to the command */
780	kill (-cmd_pid, SIGWINCH);	656	kill (-cmd_pid, SIGWINCH);
781	#endif	657	#endif
782	}	658	}
783		659
…		…
812	delete fontset[0];	688	delete fontset[0];
813	fontset[0] = fs;	689	fontset[0] = fs;
814		690
815	prop = (*fs)[1]->properties ();	691	prop = (*fs)[1]->properties ();
816	prop.height += lineSpace;	692	prop.height += lineSpace;
		693
817	fs->set_prop (prop);	694	fs->set_prop (prop, false);
818		695
819	fwidth = prop.width;	696	fwidth = prop.width;
820	fheight = prop.height;	697	fheight = prop.height;
821	fbase = prop.ascent;	698	fbase = prop.ascent;
822		699
…		…
831	{	708	{
832	fontset[style] = fs = new rxvt_fontset (this);	709	fontset[style] = fs = new rxvt_fontset (this);
833	rxvt_fontprop prop2 = prop;	710	rxvt_fontprop prop2 = prop;
834		711
835	if (res)	712	if (res)
836	prop2.weight = prop2.slant = rxvt_fontprop::unset;	713	{
		714	fs->populate (res);
		715	fs->set_prop (prop2, false);
		716	}
837	else	717	else
838	{	718	{
839	res = fontset[0]->fontdesc;	719	fs->populate (fontset[0]->fontdesc);
840		720
841	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	721	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
842	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	722	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		723
		724	fs->set_prop (prop2, true);
843	}	725	}
844		726
845	fs->populate (res);
846	fs->set_prop (prop2);
847	}	727	}
848	#else	728	#else
849	fontset[style] = fontset[0];	729	fontset[style] = fontset[0];
850	#endif	730	#endif
851	}	731	}
…		…
853	if (parent[0])	733	if (parent[0])
854	{	734	{
855	resize_all_windows (0, 0, 0);	735	resize_all_windows (0, 0, 0);
856	scr_remap_chars ();	736	scr_remap_chars ();
857	scr_touch (true);	737	scr_touch (true);
858	}	738	}
859		739
860	return true;	740	return true;
861	}	741	}
862		742
		743	void
863	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	744	rxvt_term::set_string_property (Atom prop, const char *str, int len)
864	{	745	{
865	XChangeProperty (dpy, parent[0],	746	XChangeProperty (dpy, parent[0],
866	prop, XA_STRING, 8, PropModeReplace,	747	prop, XA_STRING, 8, PropModeReplace,
867	(const unsigned char *)str, len >= 0 ? len : strlen (str));	748	(const unsigned char *)str, len >= 0 ? len : strlen (str));
868	}	749	}
869		750
		751	void
870	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	752	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871	{	753	{
872	wchar_t *ws = rxvt_mbstowcs (str, len);	754	wchar_t *ws = rxvt_mbstowcs (str, len);
873	char *s = rxvt_wcstoutf8 (ws);	755	char *s = rxvt_wcstoutf8 (ws);
874		756
875	XChangeProperty (dpy, parent[0],	757	XChangeProperty (dpy, parent[0],
…		…
899	#if ENABLE_EWMH	781	#if ENABLE_EWMH
900	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	782	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901	#endif	783	#endif
902	}	784	}
903		785
		786	void
		787	rxvt_term::set_window_color (int idx, const char *color)
		788	{
904	#ifdef XTERM_COLOR_CHANGE	789	#ifdef XTERM_COLOR_CHANGE
905	void
906	rxvt_term::set_window_color (int idx, const char *color)
907	{
908	rxvt_color xcol;	790	rxvt_color xcol;
909	int i;	791
910
911	if (color == NULL \|\| *color == '\0')	792	if (color == NULL \|\| *color == '\0')
912	return;	793	return;
913		794
914	color = strdup (color);	795	color = strdup (color);
915	allocated.push_back ((void *)color);	796	allocated.push_back ((void *)color);
916	rs[Rs_color + idx] = color;	797	rs[Rs_color + idx] = color;
917		798
918	/* handle color aliases */	799	/* handle color aliases */
919	if (isdigit (*color))	800	if (isdigit (*color))
920	{	801	{
921	i = atoi (color);	802	int i = atoi (color);
922		803
923	if (i >= 8 && i <= 15)	804	if (i >= 8 && i <= 15)
		805	{
924	{ /* bright colors */	806	/* bright colors */
925	i -= 8;
926	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	807	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
927	goto done;	808	goto done;
928	}	809	}
929		810
930	if (i >= 0 && i <= 7)	811	if (i >= 0 && i <= 7)
		812	{
931	{ /* normal colors */	813	/* normal colors */
932	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	814	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
933	goto done;	815	goto done;
934	}	816	}
935	}	817	}
936		818
…		…
941	* so just keep gobbling up the colormap	823	* so just keep gobbling up the colormap
942	*/	824	*/
943		825
944	pix_colors_focused[idx] = xcol;	826	pix_colors_focused[idx] = xcol;
945		827
946	/* XSetWindowAttributes attr; */
947	/* Cursor cursor; */
948	done:	828	done:
949	/TODO: handle Color_BD, scrollbar background, etc. /	829	/TODO: handle Color_BD, scrollbar background, etc. /
950		830
951	update_fade_color (idx);	831	update_fade_color (idx);
952	recolour_cursor ();	832	recolour_cursor ();
953	scr_recolour ();	833	scr_recolour ();
		834	#endif /* XTERM_COLOR_CHANGE */
954	}	835	}
955
956	#else
957	# define set_window_color (idx,color) ((void)0)
958	#endif /* XTERM_COLOR_CHANGE */
959		836
960	void	837	void
961	rxvt_term::recolour_cursor ()	838	rxvt_term::recolour_cursor ()
962	{	839	{
963	XColor fg, bg;	840	XColor fg, bg;
…		…
979	*/	856	*/
980	void	857	void
981	rxvt_term::set_colorfgbg ()	858	rxvt_term::set_colorfgbg ()
982	{	859	{
983	unsigned int i;	860	unsigned int i;
984	const char *xpmb = "\0";	861	const char *xpmb = "";
985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	862	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986		863
987	strcpy (fstr, "default");	864	strcpy (fstr, "default");
988	strcpy (bstr, "default");	865	strcpy (bstr, "default");
989	for (i = Color_Black; i <= Color_White; i++)	866	for (i = Color_Black; i <= Color_White; i++)
…		…
995		872
996	for (i = Color_Black; i <= Color_White; i++)	873	for (i = Color_Black; i <= Color_White; i++)
997	if (pix_colors[Color_bg] == pix_colors[i])	874	if (pix_colors[Color_bg] == pix_colors[i])
998	{	875	{
999	sprintf (bstr, "%d", (i - Color_Black));	876	sprintf (bstr, "%d", (i - Color_Black));
1000	#ifdef XPM_BACKGROUND	877	#ifdef BG_IMAGE_FROM_FILE
1001	xpmb = "default;";	878	xpmb = "default;";
1002	#endif	879	#endif
1003	break;	880	break;
1004	}	881	}
1005		882
…		…
1090	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	967	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1091		968
1092	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	969	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1093	{	970	{
1094	if (scrollBar.state)	971	if (scrollBar.state)
1095	{	972	scrollBar.resize ();
1096	XMoveResizeWindow (dpy, scrollBar.win,
1097	window_sb_x, 0,
1098	scrollbar_TotalWidth (), szHint.height);
1099	resize_scrollbar ();
1100	}
1101		973
1102	XMoveResizeWindow (dpy, vt,	974	XMoveResizeWindow (dpy, vt,
1103	window_vt_x, window_vt_y,	975	window_vt_x, window_vt_y,
1104	width, height);	976	width, height);
1105		977
		978	#ifdef HAVE_BG_PIXMAP
		979	if (bgPixmap.window_size_sensitive ())
		980	update_background ();
		981	#endif
		982
1106	scr_clear ();	983	scr_clear ();
1107	#ifdef XPM_BACKGROUND
1108	resize_pixmap ();
1109	#endif
1110	}	984	}
1111		985
1112	if (fix_screen \|\| old_height == 0)	986	if (fix_screen \|\| old_height == 0)
1113	scr_reset ();	987	scr_reset ();
1114		988
1115	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	989	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116	//scr_touch (false);	990	//scr_touch (false);
1117		991
1118	#ifdef XPM_BACKGROUND	992	#ifdef HAVE_BG_PIXMAP
1119	if (pixmap)	993	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		994	// if (bgPixmap.pixmap)
1120	scr_touch (false);	995	// scr_touch (false);
1121	#endif	996	#endif
1122		997
1123	#ifdef USE_XIM	998	#ifdef USE_XIM
1124	IMSetPosition ();	999	IMSetPosition ();
1125	#endif	1000	#endif
…		…
1296	if (term->rs[Rs_imLocale])	1171	if (term->rs[Rs_imLocale])
1297	SET_LOCALE (term->locale);	1172	SET_LOCALE (term->locale);
1298	}	1173	}
1299	else	1174	else
1300	str = (void *)text->string.wide_char;	1175	str = (void *)text->string.wide_char;
1301		1176
1302	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1177	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303	DT_INT, call_data->caret,	1178	DT_INT, call_data->caret,
1304	DT_INT, call_data->chg_first,	1179	DT_INT, call_data->chg_first,
1305	DT_INT, call_data->chg_length,	1180	DT_INT, call_data->chg_length,
1306	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1181	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1625		1500
1626	if (input_style & XIMPreeditPosition)	1501	if (input_style & XIMPreeditPosition)
1627	{	1502	{
1628	im_set_size (preedit_rect);	1503	im_set_size (preedit_rect);
1629	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1504	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630		1505
1631	XSetICValues (Input_Context,	1506	XSetICValues (Input_Context,
1632	XNPreeditAttributes, preedit_attr, NULL);	1507	XNPreeditAttributes, preedit_attr, NULL);
1633	}	1508	}
1634	else	1509	else
1635	{	1510	{
…		…
1652	XFree (status_attr);	1527	XFree (status_attr);
1653	}	1528	}
1654		1529
1655	XFree (preedit_attr);	1530	XFree (preedit_attr);
1656	}	1531	}
1657	#endif /* USE_XIM */	1532	#endif /* USE_XIM */
		1533
		1534	void
		1535	rxvt_term::get_window_origin (int &x, int &y)
		1536	{
		1537	Window cr;
		1538	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1539	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1540	}
		1541
		1542	Pixmap
		1543	rxvt_term::get_pixmap_property (int prop_id)
		1544	{
		1545	if (prop_id > 0 && prop_id < NUM_XA)
		1546	if (xa[prop_id])
		1547	{
		1548	int aformat;
		1549	unsigned long nitems, bytes_after;
		1550	Atom atype;
		1551	unsigned char *prop = NULL;
		1552	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1553	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1554	&nitems, &bytes_after, &prop);
		1555	if (result == Success && prop && atype == XA_PIXMAP)
		1556	return (Pixmap )prop;
		1557	}
		1558
		1559	return None;
		1560	}
		1561
		1562	#ifdef HAVE_BG_PIXMAP
		1563	# if TRACE_PIXMAPS
		1564	# undef update_background
		1565	void
		1566	rxvt_term::trace_update_background (const char *file, int line)
		1567	{
		1568	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1569	update_background ();
		1570	}
		1571	# endif
		1572
		1573	void
		1574	rxvt_term::update_background ()
		1575	{
		1576	if (update_background_ev.is_active ())
		1577	return;
		1578
		1579	bgPixmap.invalidate ();
		1580
		1581	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1582
		1583	if (to_wait <= 0.)
		1584	bgPixmap.render ();
		1585	else
		1586	update_background_ev.start (to_wait);
		1587	}
		1588
		1589	void
		1590	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1591	{
		1592	make_current ();
		1593
		1594	update_background_ev.stop ();
		1595	bgPixmap.render ();
		1596	refresh_check ();
		1597	}
		1598
		1599	#endif /* HAVE_BG_PIXMAP */
1658		1600
1659	/----------------------- end-of-file (C source) -----------------------/	1601	/----------------------- 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.227 by root, Fri Jul 28 17:16:42 2006 UTC vs. Revision 1.311 by root, Tue Nov 4 13:28:40 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.227 by root, Fri Jul 28 17:16:42 2006 UTC vs.
Revision 1.311 by root, Tue Nov 4 13:28:40 2008 UTC