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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.326 by sf-exg, Sat Apr 3 16:30:39 2010 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 HAVE_TERMIOS_H
44	# include <termios.h>	43	#include <termios.h>
45	#endif
46		44
47	#ifdef HAVE_XSETLOCALE	45	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	46	# define X_LOCALE
49	# include <X11/Xlocale.h>	47	# include <X11/Xlocale.h>
50	#else	48	#else
…		…
103	{	101	{
104	if (cc->c2 == c2) return c1;	102	if (cc->c2 == c2) return c1;
105	cc = (*this)[cc->c1];	103	cc = (*this)[cc->c1];
106	}	104	}
107		105
108	// check to see wether this combination already exists otherwise	106	// check to see whether this combination already exists otherwise
109	for (cc = v.end (); cc-- > v.begin (); )	107	for (cc = v.end (); cc-- > v.begin (); )
110	{	108	{
111	if (cc->c1 == c1 && cc->c2 == c2)	109	if (cc->c1 == c1 && cc->c2 == c2)
112	return COMPOSE_LO + (cc - v.begin ());	110	return COMPOSE_LO + (cc - v.begin ());
113	}	111	}
…		…
152		150
153	}	151	}
154	#endif	152	#endif
155		153
156	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
157	:	155	{
158	#if HAVE_BG_PIXMAP	156	#if HAVE_BG_PIXMAP
159	update_background_ev(this, &rxvt_term::update_background_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160	#endif	158	#endif
161	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
162	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);
163	#endif	161	#endif
164	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
165	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);
166	#endif	164	#endif
167	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169	#endif	167	#endif
170	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
171	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172	#endif	170	#endif
173	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174	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),
175	#endif	180	#endif
176	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
177	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178	#endif	183	#endif
179	#ifndef NO_BELL	184	#ifndef NO_BELL
180	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181	#endif	186	#endif
182	child_ev (this, &rxvt_term::child_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183	prepare_ev (this, &rxvt_term::prepare_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184	flush_ev (this, &rxvt_term::flush_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185	destroy_ev (this, &rxvt_term::destroy_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186	pty_ev (this, &rxvt_term::pty_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
187	incr_ev (this, &rxvt_term::incr_cb)	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188	{	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
190	callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191	#endif
192	#ifdef HAVE_SCROLLBARS
193	callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194	#endif
195	#ifdef USE_XIM
196	callback_set (im_ev , this, rxvt_term, im_cb);
197	#endif
198	callback_set (termwin_ev , this, rxvt_term, x_cb);
199	callback_set (vt_ev , this, rxvt_term, x_cb);
200		194
201	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202		196
203	termlist.push_back (this);	197	termlist.push_back (this);
204		198
…		…
230	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
231	delete fontset[i];	225	delete fontset[i];
232	#endif	226	#endif
233	delete fontset[0];	227	delete fontset[0];
234		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
235	if (display)	239	if (display)
236	{	240	{
237	selection_clear ();	241	selection_clear ();
		242	selection_clear (true);
238		243
239	#ifdef USE_XIM	244	#ifdef USE_XIM
240	im_destroy ();	245	im_destroy ();
241	#endif	246	#endif
242	#ifdef XTERM_SCROLLBAR	247	scrollBar.destroy ();
243	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244	if (ShadowGC) XFreeGC (dpy, ShadowGC);
245	#endif
246	#ifdef PLAIN_SCROLLBAR
247	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248	#endif
249	#ifdef NEXT_SCROLLBAR
250	if (blackGC) XFreeGC (dpy, blackGC);
251	if (whiteGC) XFreeGC (dpy, whiteGC);
252	if (grayGC) XFreeGC (dpy, grayGC);
253	if (darkGC) XFreeGC (dpy, darkGC);
254	if (stippleGC) XFreeGC (dpy, stippleGC);
255	if (dimple) XFreePixmap (dpy, dimple);
256	if (upArrow) XFreePixmap (dpy, upArrow);
257	if (downArrow) XFreePixmap (dpy, downArrow);
258	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260	#endif
261	#ifdef RXVT_SCROLLBAR
262	if (topShadowGC) XFreeGC (dpy, topShadowGC);
263	if (botShadowGC) XFreeGC (dpy, botShadowGC);
264	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265	#endif
266	if (gc) XFreeGC (dpy, gc);	248	if (gc) XFreeGC (dpy, gc);
267		249
268	delete drawable;	250	delete drawable;
269	// destroy all windows	251	// destroy all windows
270	if (parent[0])	252	if (parent[0])
…		…
278	pix_colors_unfocused [i].free (this);	260	pix_colors_unfocused [i].free (this);
279	#endif	261	#endif
280	}	262	}
281		263
282	clear ();	264	clear ();
283	}
284		265
285	delete [] pix_colors_focused;	266	display->flush (); /* ideally .put should do this */
286	#if OFF_FOCUS_FADING
287	delete [] pix_colors_unfocused;
288	#endif
289
290	#ifdef HAVE_BG_PIXMAP
291	bgPixmap.destroy ();
292	#endif
293	displays.put (display);	267	displays.put (display);
		268	}
294		269
295	scr_release ();	270	scr_release ();
296		271
297	/* clear all resources */	272	/* clear all resources */
298	for (int i = 0; i < allocated.size (); i++)	273	for (int i = 0; i < allocated.size (); i++)
299	free (allocated [i]);	274	free (allocated [i]);
300		275
301	free (selection.text);	276	free (selection.text);
		277	free (selection.clip_text);
302	// TODO: manage env vars in child only(!)	278	// TODO: manage env vars in child only(!)
303	free (env_display);	279	free (env_display);
304	free (env_term);	280	free (env_term);
305	free (locale);	281	free (locale);
306	free (v_buffer);	282	free (v_buffer);
…		…
330	}	306	}
331		307
332	void	308	void
333	rxvt_term::destroy ()	309	rxvt_term::destroy ()
334	{	310	{
335	if (destroy_ev.active)	311	if (destroy_ev.is_active ())
336	return;	312	return;
337		313
338	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	314	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339		315
340	#if ENABLE_OVERLAY	316	#if ENABLE_OVERLAY
…		…
344	if (display)	320	if (display)
345	{	321	{
346	#if USE_XIM	322	#if USE_XIM
347	im_ev.stop (display);	323	im_ev.stop (display);
348	#endif	324	#endif
349	#if HAVE_SCROLLBARS
350	scrollbar_ev.stop (display);	325	scrollbar_ev.stop (display);
351	#endif
352	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	326	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
353	rootwin_ev.stop (display);	327	rootwin_ev.stop (display);
354	#endif	328	#endif
355	incr_ev.stop ();	329	incr_ev.stop ();
356	termwin_ev.stop (display);	330	termwin_ev.stop (display);
357	vt_ev.stop (display);	331	vt_ev.stop (display);
358	}	332	}
359		333
360	prepare_ev.stop ();	334	flush_ev.stop ();
361	pty_ev.stop ();	335	pty_ev.stop ();
362	#ifdef CURSOR_BLINK	336	#ifdef CURSOR_BLINK
363	cursor_blink_ev.stop ();	337	cursor_blink_ev.stop ();
364	#endif	338	#endif
365	#ifdef TEXT_BLINK	339	#ifdef TEXT_BLINK
…		…
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	390	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
417	sprintf(number, "%d", event->request_code);	391	sprintf(number, "%d", event->request_code);
418	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	392	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
419	rxvt_warn ("(which is %s)\n", buffer);	393	rxvt_warn ("(which is %s)\n", buffer);
420	if (event->request_code >= 128) {	394	if (event->request_code >= 128) {
421	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	395	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
422	mesg, BUFSIZ);	396	mesg, BUFSIZ);
423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	397	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
424	}	398	}
425	if ((event->error_code == BadWindow) \|\|	399	if ((event->error_code == BadWindow) \|\|
426	(event->error_code == BadPixmap) \|\|	400	(event->error_code == BadPixmap) \|\|
427	(event->error_code == BadCursor) \|\|	401	(event->error_code == BadCursor) \|\|
428	(event->error_code == BadFont) \|\|	402	(event->error_code == BadFont) \|\|
429	(event->error_code == BadDrawable) \|\|	403	(event->error_code == BadDrawable) \|\|
430	(event->error_code == BadColor) \|\|	404	(event->error_code == BadColor) \|\|
431	(event->error_code == BadGC) \|\|	405	(event->error_code == BadGC) \|\|
432	(event->error_code == BadIDChoice) \|\|	406	(event->error_code == BadIDChoice) \|\|
433	(event->error_code == BadValue) \|\|	407	(event->error_code == BadValue) \|\|
434	(event->error_code == BadAtom)) {	408	(event->error_code == BadAtom)) {
435	if (event->error_code == BadValue)	409	if (event->error_code == BadValue)
436	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	410	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
437	mesg, BUFSIZ);	411	mesg, BUFSIZ);
438	else if (event->error_code == BadAtom)	412	else if (event->error_code == BadAtom)
439	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	413	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
440	mesg, BUFSIZ);	414	mesg, BUFSIZ);
441	else	415	else
442	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
443	mesg, BUFSIZ);	417	mesg, BUFSIZ);
444	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	418	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
445	}	419	}
446	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	420	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
447	mesg, BUFSIZ);	421	mesg, BUFSIZ);
448	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	422	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
449	}	423	}
450	#endif	424	#endif
451		425
452	int	426	int
…		…
475	DisplayString (display));	449	DisplayString (display));
476	rxvt_emergency_cleanup ();	450	rxvt_emergency_cleanup ();
477	_exit (EXIT_FAILURE);	451	_exit (EXIT_FAILURE);
478	}	452	}
479		453
480	/----------------------------------------------------------------------/
481	bool
482	rxvt_term::init (int argc, const char const argv, stringvec *envv)
483	{
484	this->envv = envv;
485
486	SET_R (this);
487	set_locale ("");
488	set_environ (envv); // few things in X do not call setlocale :(
489
490	if (!init_vars ())
491	return false;
492
493	init_secondary ();
494
495	const char **cmd_argv = init_resources (argc, argv);
496
497	#ifdef KEYSYM_RESOURCE
498	keyboard->register_done ();
499	#endif
500
501	#ifdef HAVE_SCROLLBARS
502	if (option (Opt_scrollBar))
503	scrollBar.setIdle (); /* set existence for size calculations */
504	#endif
505
506	pty = ptytty::create ();
507
508	create_windows (argc, argv);
509
510	init_xlocale ();
511
512	scr_reset (); // initialize screen
513
514	#if 0
515	XSynchronize (dpy, True);
516	#endif
517
518	#ifdef HAVE_SCROLLBARS
519	if (option (Opt_scrollBar))
520	resize_scrollbar (); /* create and map scrollbar */
521	#endif
522	#ifdef HAVE_BG_PIXMAP
523	{
524	bgPixmap.set_target (this);
525
526	#ifdef ENABLE_TRANSPARENCY
527	if (option (Opt_transparent))
528	{
529	bgPixmap.set_transparent ();
530	#ifdef HAVE_AFTERIMAGE
531	if (rs [Rs_blurradius])
532	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533	#endif
534	if (ISSET_PIXCOLOR (Color_tint))
535	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536	if (rs [Rs_shade])
537	bgPixmap.set_shade (rs [Rs_shade]);
538
539	bgPixmap.set_root_pixmap ();
540	XSelectInput (dpy, display->root, PropertyChangeMask);
541	rootwin_ev.start (display, display->root);
542	}
543	#endif
544
545	#ifdef BG_IMAGE_FROM_FILE
546	if (rs[Rs_backgroundPixmap] != NULL)
547	{
548	const char *p = rs[Rs_backgroundPixmap];
549
550	if ((p = strchr (p, ';')) != NULL)
551	{
552	p++;
553	bgPixmap.set_geometry (p);
554	}
555	else
556	bgPixmap.set_defaultGeometry ();
557
558	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559	if (!bgPixmap.window_position_sensitive ())
560	update_background ();
561	}
562	#endif
563	}
564	#endif
565
566	#if ENABLE_PERL
567	rootwin_ev.start (display, display->root);
568	#endif
569
570	set_colorfgbg ();
571
572	init_command (cmd_argv);
573
574	free (cmd_argv);
575
576	if (pty->pty >= 0)
577	pty_ev.start (pty->pty, ev::READ);
578
579	prepare_ev.start ();
580
581	HOOK_INVOKE ((this, HOOK_START, DT_END));
582
583	#if ENABLE_XEMBED
584	if (rs[Rs_embed])
585	{
586	long info[2] = { 0, XEMBED_MAPPED };
587
588	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
589	32, PropModeReplace, (unsigned char *)&info, 2);
590	}
591	#endif
592
593	XMapWindow (dpy, vt);
594	XMapWindow (dpy, parent[0]);
595
596	return true;
597	}
598
599	static struct sig_handlers	454	static struct sig_handlers
600	{	455	{
601	ev::sig sw_term, sw_int;	456	ev::sig sw_term, sw_int;
602		457
603	/*	458	/*
604	* Catch a fatal signal and tidy up before quitting	459	* Catch a fatal signal and tidy up before quitting
605	*/	460	*/
606	void
607	sig_term (ev::sig &w, int revents)	461	void sig_term (ev::sig &w, int revents);
		462
		463	sig_handlers ()
608	{	464	{
609	rxvt_emergency_cleanup ();	465	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610	w.stop ();
611	kill (getpid (), w.signum);
612	}
613
614	sig_handlers ()
615	: sw_term (this, &sig_handlers::sig_term),
616	sw_int (this, &sig_handlers::sig_term)	466	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617	{
618	}	467	}
619	} sig_handlers;	468	} sig_handlers;
		469
		470	void
		471	sig_handlers::sig_term (ev::sig &w, int revents)
		472	{
		473	rxvt_emergency_cleanup ();
		474	w.stop ();
		475	kill (getpid (), w.signum);
		476	}
620		477
621	char **rxvt_environ; // startup environment	478	char **rxvt_environ; // startup environment
622		479
623	void	480	void
624	rxvt_init ()	481	rxvt_init ()
…		…
642	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	499	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643	// TODO: handle this with exceptions and tolerate the memory loss	500	// TODO: handle this with exceptions and tolerate the memory loss
644	XSetIOErrorHandler (rxvt_xioerror_handler);	501	XSetIOErrorHandler (rxvt_xioerror_handler);
645		502
646	XrmInitialize ();	503	XrmInitialize ();
647	}
648
649	/* ------------------------------------------------------------------------- *
650	* MEMORY ALLOCATION WRAPPERS *
651	* ------------------------------------------------------------------------- */
652	void *
653	rxvt_malloc (size_t size)
654	{
655	void *p = malloc (size);
656
657	if (!p)
658	rxvt_fatal ("memory allocation failure. aborting.\n");
659
660	return p;
661	}
662
663	void *
664	rxvt_calloc (size_t number, size_t size)
665	{
666	void *p = calloc (number, size);
667
668	if (!p)
669	rxvt_fatal ("memory allocation failure. aborting.\n");
670
671	return p;
672	}
673
674	void *
675	rxvt_realloc (void *ptr, size_t size)
676	{
677	void *p = realloc (ptr, size);
678
679	if (!p)
680	rxvt_fatal ("memory allocation failure. aborting.\n");
681
682	return p;
683	}	504	}
684		505
685	/----------------------------------------------------------------------/	506	/----------------------------------------------------------------------/
686	/*	507	/*
687	* window size/position calculations for XSizeHint and other storage.	508	* window size/position calculations for XSizeHint and other storage.
…		…
689	*/	510	*/
690	void	511	void
691	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	512	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
692	{	513	{
693	short recalc_x, recalc_y;	514	short recalc_x, recalc_y;
694	int x, y, sb_w, flags;	515	int x, y, flags;
695	unsigned int w, h;	516	unsigned int w, h;
696	unsigned int max_width, max_height;	517	unsigned int max_width, max_height;
697		518
698	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	519	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
699	szHint.win_gravity = NorthWestGravity;	520	szHint.win_gravity = NorthWestGravity;
…		…
709	if (rs[Rs_geometry])	530	if (rs[Rs_geometry])
710	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	531	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
711		532
712	if (flags & WidthValue)	533	if (flags & WidthValue)
713	{	534	{
		535	if (!w)
		536	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		537
714	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	538	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
715	szHint.flags \|= USSize;	539	szHint.flags \|= USSize;
716	}	540	}
717		541
718	if (flags & HeightValue)	542	if (flags & HeightValue)
719	{	543	{
		544	if (!h)
		545	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		546
720	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	547	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
721	szHint.flags \|= USSize;	548	szHint.flags \|= USSize;
722	}	549	}
723		550
724	if (flags & XValue)	551	if (flags & XValue)
725	{	552	{
…		…
756	max_width = MAX_COLS * fwidth;	583	max_width = MAX_COLS * fwidth;
757	max_height = MAX_ROWS * fheight;	584	max_height = MAX_ROWS * fheight;
758		585
759	szHint.base_width = szHint.base_height = 2 * int_bwidth;	586	szHint.base_width = szHint.base_height = 2 * int_bwidth;
760		587
761	sb_w = 0;
762	window_vt_x = window_vt_y = int_bwidth;	588	window_vt_x = window_vt_y = int_bwidth;
763		589
764	if (scrollBar.state)	590	if (scrollBar.state)
765	{	591	{
766	sb_w = scrollbar_TotalWidth ();	592	int sb_w = scrollBar.total_width ();
767	szHint.base_width += sb_w;	593	szHint.base_width += sb_w;
768		594
769	if (!option (Opt_scrollBar_right))	595	if (!option (Opt_scrollBar_right))
770	window_vt_x += sb_w;	596	window_vt_x += sb_w;
771	}	597	}
…		…
795	{	621	{
796	min_it (height, max_height);	622	min_it (height, max_height);
797	szHint.height = szHint.base_height + height;	623	szHint.height = szHint.base_height + height;
798	}	624	}
799		625
800	if (scrollBar.state && option (Opt_scrollBar_right))
801	window_sb_x = szHint.width - sb_w;
802
803	if (recalc_x)	626	if (recalc_x)
804	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	627	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
805		628
806	if (recalc_y)	629	if (recalc_y)
807	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	630	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
808		631
809	ncol = width / fwidth;	632	ncol = width / fwidth;
810	nrow = height / fheight;	633	nrow = height / fheight;
811	}	634	}
812		635
813	/----------------------------------------------------------------------/	636	/----------------------------------------------------------------------/
814	/*	637	/*
…		…
825		648
826	ws.ws_col = ncol;	649	ws.ws_col = ncol;
827	ws.ws_row = nrow;	650	ws.ws_row = nrow;
828	ws.ws_xpixel = width;	651	ws.ws_xpixel = width;
829	ws.ws_ypixel = height;	652	ws.ws_ypixel = height;
830	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	653	ioctl (pty->pty, TIOCSWINSZ, &ws);
831		654
832	#if 0	655	#if 0
833	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	656	// TIOCSWINSZ is supposed to do this automatically and correctly
834	if (cmd_pid) /* force through to the command */	657	if (cmd_pid) /* force through to the command */
835	kill (-cmd_pid, SIGWINCH);	658	kill (-cmd_pid, SIGWINCH);
836	#endif	659	#endif
837	}	660	}
838		661
…		…
865	#endif	688	#endif
866		689
867	delete fontset[0];	690	delete fontset[0];
868	fontset[0] = fs;	691	fontset[0] = fs;
869		692
870	prop = (*fs)[1]->properties ();	693	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
871	prop.height += lineSpace;	694	prop.height += lineSpace;
		695	prop.width += letterSpace;
872		696
873	fs->set_prop (prop, false);	697	fs->set_prop (prop, false);
874		698
875	fwidth = prop.width;	699	fwidth = prop.width;
876	fheight = prop.height;	700	fheight = prop.height;
…		…
965	void	789	void
966	rxvt_term::set_window_color (int idx, const char *color)	790	rxvt_term::set_window_color (int idx, const char *color)
967	{	791	{
968	#ifdef XTERM_COLOR_CHANGE	792	#ifdef XTERM_COLOR_CHANGE
969	rxvt_color xcol;	793	rxvt_color xcol;
970	int i;
971		794
972	if (color == NULL \|\| *color == '\0')	795	if (color == NULL \|\| *color == '\0')
973	return;	796	return;
974		797
975	color = strdup (color);	798	color = strdup (color);
…		…
977	rs[Rs_color + idx] = color;	800	rs[Rs_color + idx] = color;
978		801
979	/* handle color aliases */	802	/* handle color aliases */
980	if (isdigit (*color))	803	if (isdigit (*color))
981	{	804	{
982	i = atoi (color);	805	int i = atoi (color);
983		806
984	if (i >= 8 && i <= 15)	807	if (i >= 8 && i <= 15)
985	{	808	{
986	/* bright colors */	809	/* bright colors */
987	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	810	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1091	int old_width = szHint.width;	914	int old_width = szHint.width;
1092	int old_height = szHint.height;	915	int old_height = szHint.height;
1093		916
1094	window_calc (newwidth, newheight);	917	window_calc (newwidth, newheight);
1095		918
1096	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	919	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		920
		921	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		922	if (set_hint)
		923	{
		924	szHint.flags &= ~(PBaseSize \| PResizeInc);
1097	XSetWMNormalHints (dpy, parent[0], &szHint);	925	XSetWMNormalHints (dpy, parent[0], &szHint);
		926	szHint.flags \|= PBaseSize \| PResizeInc;
		927	}
1098		928
1099	if (!ignoreparent)	929	if (!ignoreparent)
1100	{	930	{
1101	#ifdef SMART_RESIZE	931	#ifdef SMART_RESIZE
1102	/*	932	/*
…		…
1142	#else	972	#else
1143	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	973	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1144	#endif	974	#endif
1145	}	975	}
1146		976
		977	if (set_hint)
		978	XSetWMNormalHints (dpy, parent[0], &szHint);
		979
1147	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	980	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1148		981
1149	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	982	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1150	{	983	{
1151	if (scrollBar.state)	984	if (scrollBar.state)
1152	{	985	scrollBar.resize ();
1153	XMoveResizeWindow (dpy, scrollBar.win,
1154	window_sb_x, 0,
1155	scrollbar_TotalWidth (), szHint.height);
1156	resize_scrollbar ();
1157	}
1158		986
1159	XMoveResizeWindow (dpy, vt,	987	XMoveResizeWindow (dpy, vt,
1160	window_vt_x, window_vt_y,	988	window_vt_x, window_vt_y,
1161	width, height);	989	width, height);
1162		990
1163	#ifdef HAVE_BG_PIXMAP	991	#ifdef HAVE_BG_PIXMAP
1164	if (bgPixmap.window_size_sensitive ())	992	if (bgPixmap.window_size_sensitive ())
1165	update_background ();	993	update_background ();
1166	#endif	994	#endif
1167
1168	scr_clear ();
1169	}	995	}
1170		996
1171	if (fix_screen \|\| old_height == 0)	997	if (fix_screen \|\| old_height == 0)
1172	scr_reset ();	998	scr_reset ();
1173
1174	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1175	//scr_touch (false);
1176		999
1177	#ifdef HAVE_BG_PIXMAP	1000	#ifdef HAVE_BG_PIXMAP
1178	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1001	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1179	// if (bgPixmap.pixmap)	1002	// if (bgPixmap.pixmap)
1180	// scr_touch (false);	1003	// scr_touch (false);
…		…
1252		1075
1253	/* Checking whether input method is running. */	1076	/* Checking whether input method is running. */
1254	bool	1077	bool
1255	rxvt_term::IMisRunning ()	1078	rxvt_term::IMisRunning ()
1256	{	1079	{
1257	char *p;
1258	Atom atom;	1080	Atom atom;
1259	Window win;	1081	Window win;
1260	char server[IMBUFSIZ];	1082	char server[IMBUFSIZ];
1261		1083
1262	/* get current locale modifier */	1084	/* get current locale modifier */
1263	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1085	if (char *p = XSetLocaleModifiers (0))
1264	{	1086	{
1265	strcpy (server, "@server=");	1087	strcpy (server, "@server=");
1266	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1088	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1267		1089
1268	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1090	if (p = strchr (server + 1, '@')) /* first one only */
1269	*p = '\0';	1091	*p = '\0';
1270		1092
1271	atom = XInternAtom (dpy, server, False);	1093	atom = XInternAtom (dpy, server, False);
1272	win = XGetSelectionOwner (dpy, atom);	1094	win = XGetSelectionOwner (dpy, atom);
1273		1095
…		…
1340		1162
1341	term->make_current ();	1163	term->make_current ();
1342		1164
1343	if (text)	1165	if (text)
1344	{	1166	{
1345	void *str;	1167	wchar_t *str;
1346		1168
1347	if (!text->encoding_is_wchar && text->string.multi_byte)	1169	if (!text->encoding_is_wchar && text->string.multi_byte)
1348	{	1170	{
1349	// of course, X makes it ugly again	1171	// of course, X makes it ugly again
1350	if (term->rs[Rs_imLocale])	1172	if (term->rs[Rs_imLocale])
1351	SET_LOCALE (term->rs[Rs_imLocale]);	1173	SET_LOCALE (term->rs[Rs_imLocale]);
1352		1174
1353	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1175	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1354	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1176	mbstowcs (str, text->string.multi_byte, text->length + 1);
1355		1177
1356	if (term->rs[Rs_imLocale])	1178	if (term->rs[Rs_imLocale])
1357	SET_LOCALE (term->locale);	1179	SET_LOCALE (term->locale);
1358	}	1180	}
1359	else	1181	else
1360	str = (void *)text->string.wide_char;	1182	str = text->string.wide_char;
1361		1183
1362	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1184	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363	DT_INT, call_data->caret,	1185	DT_INT, call_data->caret,
1364	DT_INT, call_data->chg_first,	1186	DT_INT, call_data->chg_first,
1365	DT_INT, call_data->chg_length,	1187	DT_INT, call_data->chg_length,
…		…
1719	void	1541	void
1720	rxvt_term::get_window_origin (int &x, int &y)	1542	rxvt_term::get_window_origin (int &x, int &y)
1721	{	1543	{
1722	Window cr;	1544	Window cr;
1723	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1545	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1546	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725	}	1547	}
1726		1548
1727	Pixmap	1549	Pixmap
1728	rxvt_term::get_pixmap_property (int prop_id)	1550	rxvt_term::get_pixmap_property (int prop_id)
1729	{	1551	{
…		…
1736	unsigned char *prop = NULL;	1558	unsigned char *prop = NULL;
1737	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1559	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1560	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739	&nitems, &bytes_after, &prop);	1561	&nitems, &bytes_after, &prop);
1740	if (result == Success && prop && atype == XA_PIXMAP)	1562	if (result == Success && prop && atype == XA_PIXMAP)
1741	{
1742	return (Pixmap )prop;	1563	return (Pixmap )prop;
1743	}
1744	}	1564	}
		1565
1745	return None;	1566	return None;
1746	}	1567	}
1747		1568
1748	#ifdef HAVE_BG_PIXMAP	1569	#ifdef HAVE_BG_PIXMAP
1749	# if TRACE_PIXMAPS	1570	# if TRACE_PIXMAPS
1750	# undef update_background	1571	# undef update_background
		1572	void
1751	int rxvt_term::trace_update_background (const char *file, int line)	1573	rxvt_term::trace_update_background (const char *file, int line)
1752	{	1574	{
1753	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1575	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754	update_background ();	1576	update_background ();
1755	}	1577	}
1756	# endif	1578	# endif
1757		1579
1758	int	1580	void
1759	rxvt_term::update_background ()	1581	rxvt_term::update_background ()
1760	{	1582	{
		1583	if (update_background_ev.is_active ())
		1584	return;
		1585
1761	bgPixmap.invalidate ();	1586	bgPixmap.invalidate ();
1762		1587
1763	/* no chance of real time refresh if we are blurring! */	1588	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1764	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1589
		1590	if (to_wait <= 0.)
1765	bgPixmap.render ();	1591	bgPixmap.render ();
1766	else	1592	else
1767	{
1768	update_background_ev.stop ();
1769
1770	if (!bgPixmap.need_client_side_rendering())
1771	update_background_ev.start (.05);	1593	update_background_ev.start (to_wait);
1772	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773	update_background_ev.start (.20); /* very slow !!! */
1774	else
1775	update_background_ev.start (.07);
1776	}
1777
1778	return 0;
1779	}	1594	}
1780		1595
1781	void	1596	void
1782	rxvt_term::update_background_cb (ev::timer &w, int revents)	1597	rxvt_term::update_background_cb (ev::timer &w, int revents)
1783	{	1598	{
		1599	make_current ();
		1600
		1601	update_background_ev.stop ();
1784	bgPixmap.render ();	1602	bgPixmap.render ();
		1603	refresh_check ();
1785	}	1604	}
1786		1605
1787	#endif /* HAVE_BG_PIXMAP */	1606	#endif /* HAVE_BG_PIXMAP */
1788		1607
1789	/----------------------- end-of-file (C source) -----------------------/	1608	/----------------------- 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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs. Revision 1.326 by sf-exg, Sat Apr 3 16:30:39 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.326 by sf-exg, Sat Apr 3 16:30:39 2010 UTC