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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 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
…		…
224	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
225	delete fontset[i];	225	delete fontset[i];
226	#endif	226	#endif
227	delete fontset[0];	227	delete fontset[0];
228		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
229	if (display)	233	if (display)
230	{	234	{
231	selection_clear ();	235	selection_clear ();
232		236
233	#ifdef USE_XIM	237	#ifdef USE_XIM
234	im_destroy ();	238	im_destroy ();
235	#endif	239	#endif
236	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
237	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
238	if (ShadowGC) XFreeGC (dpy, ShadowGC);
239	#endif
240	#ifdef PLAIN_SCROLLBAR
241	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
242	#endif
243	#ifdef NEXT_SCROLLBAR
244	if (blackGC) XFreeGC (dpy, blackGC);
245	if (whiteGC) XFreeGC (dpy, whiteGC);
246	if (grayGC) XFreeGC (dpy, grayGC);
247	if (darkGC) XFreeGC (dpy, darkGC);
248	if (stippleGC) XFreeGC (dpy, stippleGC);
249	if (dimple) XFreePixmap (dpy, dimple);
250	if (upArrow) XFreePixmap (dpy, upArrow);
251	if (downArrow) XFreePixmap (dpy, downArrow);
252	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
253	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
254	#endif
255	#ifdef RXVT_SCROLLBAR
256	if (topShadowGC) XFreeGC (dpy, topShadowGC);
257	if (botShadowGC) XFreeGC (dpy, botShadowGC);
258	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
259	#endif
260	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
261		242
262	delete drawable;	243	delete drawable;
263	// destroy all windows	244	// destroy all windows
264	if (parent[0])	245	if (parent[0])
…		…
272	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
273	#endif	254	#endif
274	}	255	}
275		256
276	clear ();	257	clear ();
277	}
278		258
279	delete [] pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
280	#if OFF_FOCUS_FADING
281	delete [] pix_colors_unfocused;
282	#endif
283
284	displays.put (display);	260	displays.put (display);
		261	}
285		262
286	scr_release ();	263	scr_release ();
287		264
288	/* clear all resources */	265	/* clear all resources */
289	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
301	delete argv;	278	delete argv;
302		279
303	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
304	delete keyboard;	281	delete keyboard;
305	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
306	}	286	}
307		287
308	// child has exited, usually destroys	288	// child has exited, usually destroys
309	void	289	void
310	rxvt_term::child_cb (child_watcher &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
311	{	291	{
312	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	292	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313		293
314	cmd_pid = 0;	294	cmd_pid = 0;
315		295
…		…
318	}	298	}
319		299
320	void	300	void
321	rxvt_term::destroy ()	301	rxvt_term::destroy ()
322	{	302	{
323	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
324	return;	304	return;
325		305
326	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327		307
328	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
332	if (display)	312	if (display)
333	{	313	{
334	#if USE_XIM	314	#if USE_XIM
335	im_ev.stop (display);	315	im_ev.stop (display);
336	#endif	316	#endif
337	#if HAVE_SCROLLBARS
338	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
339	#endif
340	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
341	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
342	#endif	320	#endif
343	incr_ev.stop ();	321	incr_ev.stop ();
344	termwin_ev.stop (display);	322	termwin_ev.stop (display);
345	vt_ev.stop (display);	323	vt_ev.stop (display);
346	}	324	}
347		325
348	check_ev.stop ();	326	flush_ev.stop ();
349	pty_ev.stop ();	327	pty_ev.stop ();
350	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
351	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
352	#endif	330	#endif
353	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
361	#endif	339	#endif
362	#ifdef POINTER_BLANK	340	#ifdef POINTER_BLANK
363	pointer_ev.stop ();	341	pointer_ev.stop ();
364	#endif	342	#endif
365		343
366	destroy_ev.start (0);	344	destroy_ev.start ();
367	}	345	}
368		346
369	void	347	void
370	rxvt_term::destroy_cb (time_watcher &w)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
371	{	349	{
372	make_current ();	350	make_current ();
373		351
374	delete this;	352	delete this;
375	}	353	}
…		…
429	else	407	else
430	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431	mesg, BUFSIZ);	409	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433	}	411	}
434	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435	mesg, BUFSIZ);	413	mesg, BUFSIZ);
436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437	}	415	}
438	#endif	416	#endif
439		417
…		…
463	DisplayString (display));	441	DisplayString (display));
464	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
465	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
466	}	444	}
467		445
468	/----------------------------------------------------------------------/
469	bool
470	rxvt_term::init (int argc, const char const argv, stringvec *envv)
471	{
472	this->envv = envv;
473
474	SET_R (this);
475	set_locale ("");
476	set_environ (envv); // few things in X do not call setlocale :(
477
478	if (!init_vars ())
479	return false;
480
481	init_secondary ();
482
483	const char **cmd_argv = init_resources (argc, argv);
484
485	#ifdef KEYSYM_RESOURCE
486	keyboard->register_done ();
487	#endif
488
489	#ifdef HAVE_SCROLLBARS
490	if (option (Opt_scrollBar))
491	scrollBar.setIdle (); /* set existence for size calculations */
492	#endif
493
494	pty = ptytty::create ();
495
496	create_windows (argc, argv);
497
498	init_xlocale ();
499
500	scr_reset (); // initialize screen
501
502	#if 0
503	XSynchronize (dpy, True);
504	#endif
505
506	#ifdef HAVE_SCROLLBARS
507	if (option (Opt_scrollBar))
508	resize_scrollbar (); /* create and map scrollbar */
509	#endif
510	#ifdef HAVE_BG_PIXMAP
511	{
512	bgPixmap.set_target (this);
513
514	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))
516	{
517	bgPixmap.set_transparent ();
518	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif
522	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);
526
527	bgPixmap.set_root_pixmap ();
528	XSelectInput (dpy, display->root, PropertyChangeMask);
529	rootwin_ev.start (display, display->root);
530	}
531	#endif
532
533	#ifdef BG_IMAGE_FROM_FILE
534	if (rs[Rs_backgroundPixmap] != NULL)
535	{
536	const char *p = rs[Rs_backgroundPixmap];
537
538	if ((p = strchr (p, ';')) != NULL)
539	{
540	p++;
541	bgPixmap.set_geometry (p);
542	}
543	else
544	bgPixmap.set_defaultGeometry ();
545
546	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547	if (!bgPixmap.window_position_sensitive ())
548	update_background ();
549	}
550	#endif
551	}
552	#endif
553
554	#if ENABLE_PERL
555	rootwin_ev.start (display, display->root);
556	#endif
557
558	set_colorfgbg ();
559
560	init_command (cmd_argv);
561
562	free (cmd_argv);
563
564	if (pty->pty >= 0)
565	pty_ev.start (pty->pty, EVENT_READ);
566
567	check_ev.start ();
568
569	HOOK_INVOKE ((this, HOOK_START, DT_END));
570
571	#if ENABLE_XEMBED
572	if (rs[Rs_embed])
573	{
574	long info[2] = { 0, XEMBED_MAPPED };
575
576	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
577	32, PropModeReplace, (unsigned char *)&info, 2);
578	}
579	#endif
580
581	XMapWindow (dpy, vt);
582	XMapWindow (dpy, parent[0]);
583
584	return true;
585	}
586
587	static struct sig_handlers	446	static struct sig_handlers
588	{	447	{
589	sig_watcher sw_term, sw_int;	448	ev::sig sw_term, sw_int;
590		449
591	/*	450	/*
592	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
593	*/	452	*/
594	void	453	void sig_term (ev::sig &w, int revents);
595	sig_term (sig_watcher &w)	454
		455	sig_handlers ()
596	{	456	{
597	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
598	signal (w.signum, SIG_DFL);
599	kill (getpid (), w.signum);
600	}
601
602	sig_handlers ()
603	: sw_term (this, &sig_handlers::sig_term),
604	sw_int (this, &sig_handlers::sig_term)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605	{
606	}	459	}
607	} sig_handlers;	460	} sig_handlers;
608		461
		462	void
		463	sig_handlers::sig_term (ev::sig &w, int revents)
		464	{
		465	rxvt_emergency_cleanup ();
		466	w.stop ();
		467	kill (getpid (), w.signum);
		468	}
		469
609	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
610		471
611	void	472	void
612	rxvt_init ()	473	rxvt_init ()
613	{	474	{
614	ptytty::init ();	475	ptytty::init ();
		476
		477	if (!ev_default_loop (0))
		478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615		479
616	rxvt_environ = environ;	480	rxvt_environ = environ;
617		481
618	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
619	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
620		484
621	sig_handlers.sw_term.start (SIGTERM);	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622	sig_handlers.sw_int.start (SIGINT);	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
623		487
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
626		490
627	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
628	// TODO: handle this with exceptions and tolerate the memory loss	492	// TODO: handle this with exceptions and tolerate the memory loss
629	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
630		494
631	XrmInitialize ();	495	XrmInitialize ();
632	}
633
634	/* ------------------------------------------------------------------------- *
635	* MEMORY ALLOCATION WRAPPERS *
636	* ------------------------------------------------------------------------- */
637	void *
638	rxvt_malloc (size_t size)
639	{
640	void *p = malloc (size);
641
642	if (!p)
643	rxvt_fatal ("memory allocation failure. aborting.\n");
644
645	return p;
646	}
647
648	void *
649	rxvt_calloc (size_t number, size_t size)
650	{
651	void *p = calloc (number, size);
652
653	if (!p)
654	rxvt_fatal ("memory allocation failure. aborting.\n");
655
656	return p;
657	}
658
659	void *
660	rxvt_realloc (void *ptr, size_t size)
661	{
662	void *p = realloc (ptr, size);
663
664	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");
666
667	return p;
668	}	496	}
669		497
670	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
671	/*	499	/*
672	* window size/position calculations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
…		…
674	*/	502	*/
675	void	503	void
676	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
677	{	505	{
678	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
679	int x, y, sb_w, flags;	507	int x, y, flags;
680	unsigned int w, h;	508	unsigned int w, h;
681	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
682		510
683	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
684	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
694	if (rs[Rs_geometry])	522	if (rs[Rs_geometry])
695	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	523	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
696		524
697	if (flags & WidthValue)	525	if (flags & WidthValue)
698	{	526	{
		527	if (!w)
		528	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		529
699	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	530	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
700	szHint.flags \|= USSize;	531	szHint.flags \|= USSize;
701	}	532	}
702		533
703	if (flags & HeightValue)	534	if (flags & HeightValue)
704	{	535	{
		536	if (!h)
		537	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		538
705	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	539	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
706	szHint.flags \|= USSize;	540	szHint.flags \|= USSize;
707	}	541	}
708		542
709	if (flags & XValue)	543	if (flags & XValue)
710	{	544	{
…		…
741	max_width = MAX_COLS * fwidth;	575	max_width = MAX_COLS * fwidth;
742	max_height = MAX_ROWS * fheight;	576	max_height = MAX_ROWS * fheight;
743		577
744	szHint.base_width = szHint.base_height = 2 * int_bwidth;	578	szHint.base_width = szHint.base_height = 2 * int_bwidth;
745		579
746	sb_w = 0;
747	window_vt_x = window_vt_y = int_bwidth;	580	window_vt_x = window_vt_y = int_bwidth;
748		581
749	if (scrollBar.state)	582	if (scrollBar.state)
750	{	583	{
751	sb_w = scrollbar_TotalWidth ();	584	int sb_w = scrollBar.total_width ();
752	szHint.base_width += sb_w;	585	szHint.base_width += sb_w;
753		586
754	if (!option (Opt_scrollBar_right))	587	if (!option (Opt_scrollBar_right))
755	window_vt_x += sb_w;	588	window_vt_x += sb_w;
756	}	589	}
…		…
779	else	612	else
780	{	613	{
781	min_it (height, max_height);	614	min_it (height, max_height);
782	szHint.height = szHint.base_height + height;	615	szHint.height = szHint.base_height + height;
783	}	616	}
784
785	if (scrollBar.state && option (Opt_scrollBar_right))
786	window_sb_x = szHint.width - sb_w;
787		617
788	if (recalc_x)	618	if (recalc_x)
789	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	619	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
790		620
791	if (recalc_y)	621	if (recalc_y)
…		…
813	ws.ws_xpixel = width;	643	ws.ws_xpixel = width;
814	ws.ws_ypixel = height;	644	ws.ws_ypixel = height;
815	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	645	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
816		646
817	#if 0	647	#if 0
818	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	648	// TIOCSWINSZ is supposed to do this automatically and correctly
819	if (cmd_pid) /* force through to the command */	649	if (cmd_pid) /* force through to the command */
820	kill (-cmd_pid, SIGWINCH);	650	kill (-cmd_pid, SIGWINCH);
821	#endif	651	#endif
822	}	652	}
823		653
…		…
897	if (parent[0])	727	if (parent[0])
898	{	728	{
899	resize_all_windows (0, 0, 0);	729	resize_all_windows (0, 0, 0);
900	scr_remap_chars ();	730	scr_remap_chars ();
901	scr_touch (true);	731	scr_touch (true);
902	}	732	}
903		733
904	return true;	734	return true;
905	}	735	}
906		736
907	void	737	void
…		…
950	void	780	void
951	rxvt_term::set_window_color (int idx, const char *color)	781	rxvt_term::set_window_color (int idx, const char *color)
952	{	782	{
953	#ifdef XTERM_COLOR_CHANGE	783	#ifdef XTERM_COLOR_CHANGE
954	rxvt_color xcol;	784	rxvt_color xcol;
955	int i;	785
956
957	if (color == NULL \|\| *color == '\0')	786	if (color == NULL \|\| *color == '\0')
958	return;	787	return;
959		788
960	color = strdup (color);	789	color = strdup (color);
961	allocated.push_back ((void *)color);	790	allocated.push_back ((void *)color);
962	rs[Rs_color + idx] = color;	791	rs[Rs_color + idx] = color;
963		792
964	/* handle color aliases */	793	/* handle color aliases */
965	if (isdigit (*color))	794	if (isdigit (*color))
966	{	795	{
967	i = atoi (color);	796	int i = atoi (color);
968		797
969	if (i >= 8 && i <= 15)	798	if (i >= 8 && i <= 15)
		799	{
970	{ /* bright colors */	800	/* bright colors */
971	i -= 8;
972	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	801	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973	goto done;	802	goto done;
974	}	803	}
975		804
976	if (i >= 0 && i <= 7)	805	if (i >= 0 && i <= 7)
		806	{
977	{ /* normal colors */	807	/* normal colors */
978	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	808	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979	goto done;	809	goto done;
980	}	810	}
981	}	811	}
982		812
…		…
987	* so just keep gobbling up the colormap	817	* so just keep gobbling up the colormap
988	*/	818	*/
989		819
990	pix_colors_focused[idx] = xcol;	820	pix_colors_focused[idx] = xcol;
991		821
992	/* XSetWindowAttributes attr; */
993	/* Cursor cursor; */
994	done:	822	done:
995	/TODO: handle Color_BD, scrollbar background, etc. /	823	/TODO: handle Color_BD, scrollbar background, etc. /
996		824
997	update_fade_color (idx);	825	update_fade_color (idx);
998	recolour_cursor ();	826	recolour_cursor ();
999	scr_recolour ();	827	scr_recolour ();
1000	#endif /* XTERM_COLOR_CHANGE */	828	#endif /* XTERM_COLOR_CHANGE */
1001	}	829	}
1002		830
1003	void	831	void
1004	rxvt_term::recolour_cursor ()	832	rxvt_term::recolour_cursor ()
1005	{	833	{
…		…
1022	*/	850	*/
1023	void	851	void
1024	rxvt_term::set_colorfgbg ()	852	rxvt_term::set_colorfgbg ()
1025	{	853	{
1026	unsigned int i;	854	unsigned int i;
1027	const char *xpmb = "\0";	855	const char *xpmb = "";
1028	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	856	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029		857
1030	strcpy (fstr, "default");	858	strcpy (fstr, "default");
1031	strcpy (bstr, "default");	859	strcpy (bstr, "default");
1032	for (i = Color_Black; i <= Color_White; i++)	860	for (i = Color_Black; i <= Color_White; i++)
…		…
1133	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	961	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1134		962
1135	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	963	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1136	{	964	{
1137	if (scrollBar.state)	965	if (scrollBar.state)
1138	{	966	scrollBar.resize ();
1139	XMoveResizeWindow (dpy, scrollBar.win,
1140	window_sb_x, 0,
1141	scrollbar_TotalWidth (), szHint.height);
1142	resize_scrollbar ();
1143	}
1144		967
1145	XMoveResizeWindow (dpy, vt,	968	XMoveResizeWindow (dpy, vt,
1146	window_vt_x, window_vt_y,	969	window_vt_x, window_vt_y,
1147	width, height);	970	width, height);
1148		971
…		…
1342	if (term->rs[Rs_imLocale])	1165	if (term->rs[Rs_imLocale])
1343	SET_LOCALE (term->locale);	1166	SET_LOCALE (term->locale);
1344	}	1167	}
1345	else	1168	else
1346	str = (void *)text->string.wide_char;	1169	str = (void *)text->string.wide_char;
1347		1170
1348	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1171	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349	DT_INT, call_data->caret,	1172	DT_INT, call_data->caret,
1350	DT_INT, call_data->chg_first,	1173	DT_INT, call_data->chg_first,
1351	DT_INT, call_data->chg_length,	1174	DT_INT, call_data->chg_length,
1352	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1175	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1671		1494
1672	if (input_style & XIMPreeditPosition)	1495	if (input_style & XIMPreeditPosition)
1673	{	1496	{
1674	im_set_size (preedit_rect);	1497	im_set_size (preedit_rect);
1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1498	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676		1499
1677	XSetICValues (Input_Context,	1500	XSetICValues (Input_Context,
1678	XNPreeditAttributes, preedit_attr, NULL);	1501	XNPreeditAttributes, preedit_attr, NULL);
1679	}	1502	}
1680	else	1503	else
1681	{	1504	{
…		…
1698	XFree (status_attr);	1521	XFree (status_attr);
1699	}	1522	}
1700		1523
1701	XFree (preedit_attr);	1524	XFree (preedit_attr);
1702	}	1525	}
1703	#endif /* USE_XIM */	1526	#endif /* USE_XIM */
1704		1527
1705	void	1528	void
1706	rxvt_term::get_window_origin (int &x, int &y)	1529	rxvt_term::get_window_origin (int &x, int &y)
1707	{	1530	{
1708	Window cr;	1531	Window cr;
1709	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1532	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1533	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1711	}	1534	}
1712		1535
1713	Pixmap	1536	Pixmap
1714	rxvt_term::get_pixmap_property (int prop_id)	1537	rxvt_term::get_pixmap_property (int prop_id)
1715	{	1538	{
…		…
1722	unsigned char *prop = NULL;	1545	unsigned char *prop = NULL;
1723	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1546	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1547	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725	&nitems, &bytes_after, &prop);	1548	&nitems, &bytes_after, &prop);
1726	if (result == Success && prop && atype == XA_PIXMAP)	1549	if (result == Success && prop && atype == XA_PIXMAP)
1727	{
1728	return (Pixmap )prop;	1550	return (Pixmap )prop;
1729	}
1730	}	1551	}
		1552
1731	return None;	1553	return None;
1732	}	1554	}
1733		1555
1734	#ifdef HAVE_BG_PIXMAP	1556	#ifdef HAVE_BG_PIXMAP
1735	int	1557	# if TRACE_PIXMAPS
		1558	# undef update_background
		1559	void
		1560	rxvt_term::trace_update_background (const char *file, int line)
		1561	{
		1562	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1563	update_background ();
		1564	}
		1565	# endif
		1566
		1567	void
1736	rxvt_term::update_background ()	1568	rxvt_term::update_background ()
1737	{	1569	{
		1570	if (update_background_ev.is_active ())
		1571	return;
		1572
1738	bgPixmap.invalidate ();	1573	bgPixmap.invalidate ();
1739		1574
1740	/* no chance of real time refresh if we are blurring ! */	1575	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1741	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1576
		1577	if (to_wait <= 0.)
1742	bgPixmap.render ();	1578	bgPixmap.render ();
1743	else	1579	else
1744	{	1580	update_background_ev.start (to_wait);
		1581	}
		1582
		1583	void
		1584	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1585	{
		1586	make_current ();
		1587
1745	update_background_ev.stop ();	1588	update_background_ev.stop ();
1746	if (!bgPixmap.need_client_side_rendering())
1747	update_background_ev.start (NOW + .05);
1748	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749	update_background_ev.start (NOW + .2); /* very slow !!! */
1750	else
1751	update_background_ev.start (NOW + .07);
1752	}
1753	return 0;
1754	}
1755
1756	void
1757	rxvt_term::update_background_cb (time_watcher &w)
1758	{
1759	bgPixmap.render ();	1589	bgPixmap.render ();
		1590	refresh_check ();
1760	}	1591	}
1761		1592
1762	#endif /* HAVE_BG_PIXMAP */	1593	#endif /* HAVE_BG_PIXMAP */
1763		1594
1764	/----------------------- end-of-file (C source) -----------------------/	1595	/----------------------- 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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs. Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC