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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC vs.
Revision 1.343 by sf-exg, Tue Dec 21 10:37:42 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-2007 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 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.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{	111	{
109	if (cc->c1 == c1 && cc->c2 == c2)	112	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	113	return COMPOSE_LO + (cc - v.begin ());
111	}	114	}
…		…
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	175	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	176	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	177	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	178	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	179	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	180	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	181	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	182	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	183	#endif
183	#ifdef POINTER_BLANK	184	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	185	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
226	if (fontset[i] != fontset[0])	227	if (fontset[i] != fontset[0])
227	delete fontset[i];	228	delete fontset[i];
228	#endif	229	#endif
229	delete fontset[0];	230	delete fontset[0];
230		231
		232	#ifdef HAVE_BG_PIXMAP
		233	bgPixmap.destroy ();
		234	#endif
		235	#ifdef HAVE_AFTERIMAGE
		236	if (asv)
		237	destroy_asvisual (asv, 0);
		238	if (asimman)
		239	destroy_image_manager (asimman, 0);
		240	#endif
		241
231	if (display)	242	if (display)
232	{	243	{
233	selection_clear ();	244	selection_clear ();
		245	selection_clear (true);
234		246
235	#ifdef USE_XIM	247	#ifdef USE_XIM
236	im_destroy ();	248	im_destroy ();
237	#endif	249	#endif
238	#ifdef XTERM_SCROLLBAR	250	scrollBar.destroy ();
239	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240	if (ShadowGC) XFreeGC (dpy, ShadowGC);
241	#endif
242	#ifdef PLAIN_SCROLLBAR
243	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244	#endif
245	#ifdef NEXT_SCROLLBAR
246	if (blackGC) XFreeGC (dpy, blackGC);
247	if (whiteGC) XFreeGC (dpy, whiteGC);
248	if (grayGC) XFreeGC (dpy, grayGC);
249	if (darkGC) XFreeGC (dpy, darkGC);
250	if (stippleGC) XFreeGC (dpy, stippleGC);
251	if (dimple) XFreePixmap (dpy, dimple);
252	if (upArrow) XFreePixmap (dpy, upArrow);
253	if (downArrow) XFreePixmap (dpy, downArrow);
254	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256	#endif
257	#ifdef RXVT_SCROLLBAR
258	if (topShadowGC) XFreeGC (dpy, topShadowGC);
259	if (botShadowGC) XFreeGC (dpy, botShadowGC);
260	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261	#endif
262	if (gc) XFreeGC (dpy, gc);	251	if (gc) XFreeGC (dpy, gc);
263		252
264	delete drawable;	253	delete drawable;
265	// destroy all windows	254	// destroy all windows
266	if (parent[0])	255	if (parent[0])
…		…
274	pix_colors_unfocused [i].free (this);	263	pix_colors_unfocused [i].free (this);
275	#endif	264	#endif
276	}	265	}
277		266
278	clear ();	267	clear ();
279	}
280		268
281	delete [] pix_colors_focused;
282	#if OFF_FOCUS_FADING
283	delete [] pix_colors_unfocused;
284	#endif
285
286	#ifdef HAVE_BG_PIXMAP
287	bgPixmap.destroy ();
288	#endif
289	display->flush (); /* ideally .put should do this */	269	display->flush (); /* ideally .put should do this */
290	displays.put (display);	270	displays.put (display);
		271	}
291		272
292	scr_release ();	273	scr_release ();
293		274
294	/* clear all resources */	275	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	276	for (int i = 0; i < allocated.size (); i++)
296	free (allocated [i]);	277	free (allocated [i]);
297		278
298	free (selection.text);	279	free (selection.text);
		280	free (selection.clip_text);
299	// TODO: manage env vars in child only(!)	281	// TODO: manage env vars in child only(!)
300	free (env_display);	282	free (env_display);
301	free (env_term);	283	free (env_term);
302	free (locale);	284	free (locale);
303	free (v_buffer);	285	free (v_buffer);
…		…
341	if (display)	323	if (display)
342	{	324	{
343	#if USE_XIM	325	#if USE_XIM
344	im_ev.stop (display);	326	im_ev.stop (display);
345	#endif	327	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	328	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	329	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	330	rootwin_ev.stop (display);
351	#endif	331	#endif
352	incr_ev.stop ();	332	incr_ev.stop ();
353	termwin_ev.stop (display);	333	termwin_ev.stop (display);
…		…
379	rxvt_term::destroy_cb (ev::idle &w, int revents)	359	rxvt_term::destroy_cb (ev::idle &w, int revents)
380	{	360	{
381	make_current ();	361	make_current ();
382		362
383	delete this;	363	delete this;
		364	}
		365
		366	void
		367	rxvt_term::set_option (uint8_t opt, bool set)
		368	{
		369	if (!opt)
		370	return;
		371
		372	uint8_t mask = 1 << (opt & 7);
		373	uint8_t &val = options [opt >> 3];
		374
		375	val = val & ~mask \| (set ? mask : 0);
384	}	376	}
385		377
386	/----------------------------------------------------------------------/	378	/----------------------------------------------------------------------/
387	/*	379	/*
388	* Exit gracefully, clearing the utmp entry and restoring tty attributes	380	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
402	print_x_error (Display dpy, XErrorEvent event)	394	print_x_error (Display dpy, XErrorEvent event)
403	{	395	{
404	char buffer[BUFSIZ];	396	char buffer[BUFSIZ];
405	char mesg[BUFSIZ];	397	char mesg[BUFSIZ];
406	char number[32];	398	char number[32];
407	char *mtype = "XlibMessage";	399	const char mtype[] = "XlibMessage";
408	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410	rxvt_warn ("An X Error occured, trying to continue after report.\n");	402	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411	rxvt_warn ("%s: %s\n", mesg, buffer);	403	rxvt_warn ("%s: %s\n", mesg, buffer);
412	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414	sprintf(number, "%d", event->request_code);	406	sprintf(number, "%d", event->request_code);
415	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416	rxvt_warn ("(which is %s)\n", buffer);	408	rxvt_warn ("(which is %s)\n", buffer);
417	if (event->request_code >= 128) {	409	if (event->request_code >= 128) {
418	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419	mesg, BUFSIZ);	411	mesg, BUFSIZ);
420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421	}	413	}
422	if ((event->error_code == BadWindow) \|\|	414	if ((event->error_code == BadWindow) \|\|
423	(event->error_code == BadPixmap) \|\|	415	(event->error_code == BadPixmap) \|\|
424	(event->error_code == BadCursor) \|\|	416	(event->error_code == BadCursor) \|\|
425	(event->error_code == BadFont) \|\|	417	(event->error_code == BadFont) \|\|
426	(event->error_code == BadDrawable) \|\|	418	(event->error_code == BadDrawable) \|\|
427	(event->error_code == BadColor) \|\|	419	(event->error_code == BadColor) \|\|
428	(event->error_code == BadGC) \|\|	420	(event->error_code == BadGC) \|\|
429	(event->error_code == BadIDChoice) \|\|	421	(event->error_code == BadIDChoice) \|\|
430	(event->error_code == BadValue) \|\|	422	(event->error_code == BadValue) \|\|
431	(event->error_code == BadAtom)) {	423	(event->error_code == BadAtom)) {
432	if (event->error_code == BadValue)	424	if (event->error_code == BadValue)
433	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434	mesg, BUFSIZ);	426	mesg, BUFSIZ);
435	else if (event->error_code == BadAtom)	427	else if (event->error_code == BadAtom)
436	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437	mesg, BUFSIZ);	429	mesg, BUFSIZ);
438	else	430	else
439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440	mesg, BUFSIZ);	432	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442	}	434	}
443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444	mesg, BUFSIZ);	436	mesg, BUFSIZ);
445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446	}	438	}
447	#endif	439	#endif
448		440
449	int	441	int
…		…
472	DisplayString (display));	464	DisplayString (display));
473	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
475	}	467	}
476		468
477	/----------------------------------------------------------------------/
478	void
479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
480	{
481	this->envv = envv;
482
483	SET_R (this);
484	set_locale ("");
485	set_environ (envv); // few things in X do not call setlocale :(
486
487	init_vars ();
488
489	init_secondary ();
490
491	const char **cmd_argv = init_resources (argc, argv);
492
493	#ifdef KEYSYM_RESOURCE
494	keyboard->register_done ();
495	#endif
496
497	#ifdef HAVE_SCROLLBARS
498	if (option (Opt_scrollBar))
499	scrollBar.setIdle (); /* set existence for size calculations */
500	#endif
501
502	pty = ptytty::create ();
503
504	create_windows (argc, argv);
505
506	init_xlocale ();
507
508	scr_reset (); // initialize screen
509
510	#if 0
511	XSynchronize (dpy, True);
512	#endif
513
514	#ifdef HAVE_SCROLLBARS
515	if (option (Opt_scrollBar))
516	resize_scrollbar (); /* create and map scrollbar */
517	#endif
518	#ifdef HAVE_BG_PIXMAP
519	{
520	bgPixmap.set_target (this);
521
522	#ifdef ENABLE_TRANSPARENCY
523	if (option (Opt_transparent))
524	{
525	bgPixmap.set_transparent ();
526
527	#ifdef HAVE_AFTERIMAGE
528	if (rs [Rs_blurradius])
529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530	#endif
531	if (ISSET_PIXCOLOR (Color_tint))
532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
534	if (rs [Rs_shade])
535	bgPixmap.set_shade (rs [Rs_shade]);
536
537	bgPixmap.set_root_pixmap ();
538	XSelectInput (dpy, display->root, PropertyChangeMask);
539	rootwin_ev.start (display, display->root);
540	}
541	#endif
542
543	#ifdef BG_IMAGE_FROM_FILE
544	if (rs[Rs_backgroundPixmap])
545	{
546	const char *p = rs[Rs_backgroundPixmap];
547
548	if ((p = strchr (p, ';')) != 0)
549	{
550	p++;
551	bgPixmap.set_geometry (p);
552	}
553	else
554	bgPixmap.set_defaultGeometry ();
555
556	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557	if (!bgPixmap.window_position_sensitive ())
558	update_background ();
559	}
560	#endif
561	}
562	#endif
563
564	#if ENABLE_PERL
565	rootwin_ev.start (display, display->root);
566	#endif
567
568	set_colorfgbg ();
569
570	init_command (cmd_argv);
571
572	free (cmd_argv);
573
574	if (pty->pty >= 0)
575	pty_ev.start (pty->pty, ev::READ);
576
577	HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579	#if ENABLE_XEMBED
580	if (rs[Rs_embed])
581	{
582	long info[2] = { 0, XEMBED_MAPPED };
583
584	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585	32, PropModeReplace, (unsigned char *)&info, 2);
586	}
587	#endif
588
589	XMapWindow (dpy, vt);
590	XMapWindow (dpy, parent[0]);
591	}
592
593	static struct sig_handlers	469	static struct sig_handlers
594	{	470	{
595	ev::sig sw_term, sw_int;	471	ev::sig sw_term, sw_int;
596		472
597	/*	473	/*
…		…
612	rxvt_emergency_cleanup ();	488	rxvt_emergency_cleanup ();
613	w.stop ();	489	w.stop ();
614	kill (getpid (), w.signum);	490	kill (getpid (), w.signum);
615	}	491	}
616		492
		493	static void
		494	rxvt_get_ttymode (struct termios *tio)
		495	{
		496	if (tcgetattr (STDIN_FILENO, tio) < 0)
		497	memset (tio, 0, sizeof (struct termios));
		498
		499	for (int i = 0; i < NCCS; i++)
		500	tio->c_cc[i] = VDISABLE;
		501
		502	tio->c_cc[VINTR] = CINTR;
		503	tio->c_cc[VQUIT] = CQUIT;
		504	tio->c_cc[VERASE] = CERASE;
		505	#ifdef VERASE2
		506	tio->c_cc[VERASE2] = CERASE2;
		507	#endif
		508	tio->c_cc[VKILL] = CKILL;
		509	tio->c_cc[VEOF] = CEOF;
		510	tio->c_cc[VSTART] = CSTART;
		511	tio->c_cc[VSTOP] = CSTOP;
		512	tio->c_cc[VSUSP] = CSUSP;
		513	# ifdef VDSUSP
		514	tio->c_cc[VDSUSP] = CDSUSP;
		515	# endif
		516	# ifdef VREPRINT
		517	tio->c_cc[VREPRINT] = CRPRNT;
		518	# endif
		519	# ifdef VDISCRD
		520	tio->c_cc[VDISCRD] = CFLUSH;
		521	# endif
		522	# ifdef VWERSE
		523	tio->c_cc[VWERSE] = CWERASE;
		524	# endif
		525	# ifdef VLNEXT
		526	tio->c_cc[VLNEXT] = CLNEXT;
		527	# endif
		528	# ifdef VSTATUS
		529	tio->c_cc[VSTATUS] = CSTATUS;
		530	# endif
		531
		532	# if VMIN != VEOF
		533	tio->c_cc[VMIN] = 1;
		534	# endif
		535	# if VTIME != VEOL
		536	tio->c_cc[VTIME] = 0;
		537	# endif
		538
		539	/* input modes */
		540	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		541	# ifdef IMAXBEL
		542	\| IMAXBEL
		543	# endif
		544	\| IXON);
		545
		546	/* output modes */
		547	tio->c_oflag = (OPOST \| ONLCR);
		548
		549	/* control modes */
		550	tio->c_cflag = (CS8 \| CREAD);
		551
		552	/* local modes */
		553	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		554	# if defined (ECHOCTL) && defined (ECHOKE)
		555	\| ECHOCTL \| ECHOKE
		556	# endif
		557	\| ECHOE \| ECHOK);
		558	}
		559
617	char **rxvt_environ; // startup environment	560	char **rxvt_environ; // startup environment
618		561
619	void	562	void
620	rxvt_init ()	563	rxvt_init ()
621	{	564	{
622	ptytty::init ();	565	assert (("fontMask must not overlap other RS masks",
		566	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
623		567
		568	rxvt_get_ttymode (&rxvt_term::def_tio);
		569
		570	// get rid of stdin/stdout as we don't need them, to free resources
		571	dup2 (STDERR_FILENO, STDIN_FILENO);
		572	dup2 (STDERR_FILENO, STDOUT_FILENO);
		573
624	if (!ev_default_loop (0))	574	if (!ev_default_loop ())
625	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	575	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626		576
627	rxvt_environ = environ;	577	rxvt_environ = environ;
628		578
629	signal (SIGHUP, SIG_IGN);	579	signal (SIGHUP, SIG_IGN);
630	signal (SIGPIPE, SIG_IGN);	580	signal (SIGPIPE, SIG_IGN);
631		581
632	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	582	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633	sig_handlers.sw_int.start (SIGINT); ev_unref ();	583	sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
636	/* signal (SIGURG, SIG_DFL); */
637		584
638	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	585	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639	// TODO: handle this with exceptions and tolerate the memory loss	586	// TODO: handle this with exceptions and tolerate the memory loss
640	XSetIOErrorHandler (rxvt_xioerror_handler);	587	XSetIOErrorHandler (rxvt_xioerror_handler);
641		588
…		…
649	*/	596	*/
650	void	597	void
651	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	598	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
652	{	599	{
653	short recalc_x, recalc_y;	600	short recalc_x, recalc_y;
654	int x, y, sb_w, flags;	601	int x, y, flags;
655	unsigned int w, h;	602	unsigned int w, h;
656	unsigned int max_width, max_height;	603	unsigned int max_width, max_height;
657		604
658	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	605	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
659	szHint.win_gravity = NorthWestGravity;	606	szHint.win_gravity = NorthWestGravity;
…		…
669	if (rs[Rs_geometry])	616	if (rs[Rs_geometry])
670	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	617	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
671		618
672	if (flags & WidthValue)	619	if (flags & WidthValue)
673	{	620	{
		621	if (!w)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
674	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	624	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
675	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
676	}	626	}
677		627
678	if (flags & HeightValue)	628	if (flags & HeightValue)
679	{	629	{
		630	if (!h)
		631	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		632
680	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	633	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
681	szHint.flags \|= USSize;	634	szHint.flags \|= USSize;
682	}	635	}
683		636
684	if (flags & XValue)	637	if (flags & XValue)
685	{	638	{
…		…
716	max_width = MAX_COLS * fwidth;	669	max_width = MAX_COLS * fwidth;
717	max_height = MAX_ROWS * fheight;	670	max_height = MAX_ROWS * fheight;
718		671
719	szHint.base_width = szHint.base_height = 2 * int_bwidth;	672	szHint.base_width = szHint.base_height = 2 * int_bwidth;
720		673
721	sb_w = 0;
722	window_vt_x = window_vt_y = int_bwidth;	674	window_vt_x = window_vt_y = int_bwidth;
723		675
724	if (scrollBar.state)	676	if (scrollBar.state)
725	{	677	{
726	sb_w = scrollbar_TotalWidth ();	678	int sb_w = scrollBar.total_width ();
727	szHint.base_width += sb_w;	679	szHint.base_width += sb_w;
728		680
729	if (!option (Opt_scrollBar_right))	681	if (!option (Opt_scrollBar_right))
730	window_vt_x += sb_w;	682	window_vt_x += sb_w;
731	}	683	}
…		…
755	{	707	{
756	min_it (height, max_height);	708	min_it (height, max_height);
757	szHint.height = szHint.base_height + height;	709	szHint.height = szHint.base_height + height;
758	}	710	}
759		711
760	if (scrollBar.state && option (Opt_scrollBar_right))
761	window_sb_x = szHint.width - sb_w;
762
763	if (recalc_x)	712	if (recalc_x)
764	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	713	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
765		714
766	if (recalc_y)	715	if (recalc_y)
767	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	716	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
768		717
769	ncol = width / fwidth;	718	ncol = width / fwidth;
770	nrow = height / fheight;	719	nrow = height / fheight;
771	}	720	}
772		721
773	/----------------------------------------------------------------------/	722	/----------------------------------------------------------------------/
774	/*	723	/*
…		…
785		734
786	ws.ws_col = ncol;	735	ws.ws_col = ncol;
787	ws.ws_row = nrow;	736	ws.ws_row = nrow;
788	ws.ws_xpixel = width;	737	ws.ws_xpixel = width;
789	ws.ws_ypixel = height;	738	ws.ws_ypixel = height;
790	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	739	ioctl (pty->pty, TIOCSWINSZ, &ws);
791		740
792	#if 0	741	#if 0
793	// TIOCSWINSZ is supposed to do this automatically and correctly	742	// TIOCSWINSZ is supposed to do this automatically and correctly
794	if (cmd_pid) /* force through to the command */	743	if (cmd_pid) /* force through to the command */
795	kill (-cmd_pid, SIGWINCH);	744	kill (-cmd_pid, SIGWINCH);
…		…
825	#endif	774	#endif
826		775
827	delete fontset[0];	776	delete fontset[0];
828	fontset[0] = fs;	777	fontset[0] = fs;
829		778
830	prop = (*fs)[1]->properties ();	779	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
831	prop.height += lineSpace;	780	prop.height += lineSpace;
		781	prop.width += letterSpace;
832		782
833	fs->set_prop (prop, false);	783	fs->set_prop (prop, false);
834		784
835	fwidth = prop.width;	785	fwidth = prop.width;
836	fheight = prop.height;	786	fheight = prop.height;
…		…
886	prop, XA_STRING, 8, PropModeReplace,	836	prop, XA_STRING, 8, PropModeReplace,
887	(const unsigned char *)str, len >= 0 ? len : strlen (str));	837	(const unsigned char *)str, len >= 0 ? len : strlen (str));
888	}	838	}
889		839
890	void	840	void
		841	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		842	{
		843	XTextProperty ct;
		844
		845	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		846	{
		847	XSetTextProperty (dpy, parent[0], &ct, prop);
		848	XFree (ct.value);
		849	}
		850	}
		851
		852	void
891	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	853	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
892	{	854	{
893	wchar_t *ws = rxvt_mbstowcs (str, len);	855	wchar_t *ws = rxvt_mbstowcs (str, len);
894	char *s = rxvt_wcstoutf8 (ws);	856	char *s = rxvt_wcstoutf8 (ws);
895		857
…		…
905	/----------------------------------------------------------------------/	867	/----------------------------------------------------------------------/
906	/* xterm sequences - title, iconName, color (exptl) */	868	/* xterm sequences - title, iconName, color (exptl) */
907	void	869	void
908	rxvt_term::set_title (const char *str)	870	rxvt_term::set_title (const char *str)
909	{	871	{
910	set_string_property (XA_WM_NAME, str);	872	set_mbstring_property (XA_WM_NAME, str);
911	#if ENABLE_EWMH	873	#if ENABLE_EWMH
912	set_utf8_property (xa[XA_NET_WM_NAME], str);	874	set_utf8_property (xa[XA_NET_WM_NAME], str);
913	#endif	875	#endif
914	}	876	}
915		877
916	void	878	void
917	rxvt_term::set_icon_name (const char *str)	879	rxvt_term::set_icon_name (const char *str)
918	{	880	{
919	set_string_property (XA_WM_ICON_NAME, str);	881	set_mbstring_property (XA_WM_ICON_NAME, str);
920	#if ENABLE_EWMH	882	#if ENABLE_EWMH
921	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	883	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
922	#endif	884	#endif
923	}	885	}
924		886
925	void	887	void
926	rxvt_term::set_window_color (int idx, const char *color)	888	rxvt_term::set_window_color (int idx, const char *color)
927	{	889	{
928	#ifdef XTERM_COLOR_CHANGE	890	#ifdef XTERM_COLOR_CHANGE
929	rxvt_color xcol;	891	rxvt_color xcol;
930	int i;
931		892
932	if (color == NULL \|\| *color == '\0')	893	if (color == NULL \|\| *color == '\0')
933	return;	894	return;
934		895
935	color = strdup (color);	896	color = strdup (color);
…		…
937	rs[Rs_color + idx] = color;	898	rs[Rs_color + idx] = color;
938		899
939	/* handle color aliases */	900	/* handle color aliases */
940	if (isdigit (*color))	901	if (isdigit (*color))
941	{	902	{
942	i = atoi (color);	903	int i = atoi (color);
943		904
944	if (i >= 8 && i <= 15)	905	if (i >= 8 && i <= 15)
945	{	906	{
946	/* bright colors */	907	/* bright colors */
947	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	908	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1051	int old_width = szHint.width;	1012	int old_width = szHint.width;
1052	int old_height = szHint.height;	1013	int old_height = szHint.height;
1053		1014
1054	window_calc (newwidth, newheight);	1015	window_calc (newwidth, newheight);
1055		1016
1056	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1017	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1018
		1019	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1020	if (set_hint)
		1021	{
		1022	szHint.flags &= ~(PBaseSize \| PResizeInc);
1057	XSetWMNormalHints (dpy, parent[0], &szHint);	1023	XSetWMNormalHints (dpy, parent[0], &szHint);
		1024	szHint.flags \|= PBaseSize \| PResizeInc;
		1025	}
1058		1026
1059	if (!ignoreparent)	1027	if (!ignoreparent)
1060	{	1028	{
1061	#ifdef SMART_RESIZE	1029	#ifdef SMART_RESIZE
1062	/*	1030	/*
…		…
1102	#else	1070	#else
1103	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1071	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1104	#endif	1072	#endif
1105	}	1073	}
1106		1074
		1075	if (set_hint)
		1076	XSetWMNormalHints (dpy, parent[0], &szHint);
		1077
1107	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1078	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1108		1079
1109	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1080	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1110	{	1081	{
1111	if (scrollBar.state)	1082	if (scrollBar.state)
1112	{	1083	scrollBar.resize ();
1113	XMoveResizeWindow (dpy, scrollBar.win,
1114	window_sb_x, 0,
1115	scrollbar_TotalWidth (), szHint.height);
1116	resize_scrollbar ();
1117	}
1118		1084
1119	XMoveResizeWindow (dpy, vt,	1085	XMoveResizeWindow (dpy, vt,
1120	window_vt_x, window_vt_y,	1086	window_vt_x, window_vt_y,
1121	width, height);	1087	width, height);
1122		1088
1123	#ifdef HAVE_BG_PIXMAP	1089	#ifdef HAVE_BG_PIXMAP
1124	if (bgPixmap.window_size_sensitive ())	1090	if (bgPixmap.window_size_sensitive ())
1125	update_background ();	1091	update_background ();
1126	#endif	1092	#endif
1127
1128	scr_clear ();
1129	}	1093	}
1130		1094
1131	if (fix_screen \|\| old_height == 0)	1095	if (fix_screen \|\| old_height == 0)
1132	scr_reset ();	1096	scr_reset ();
1133
1134	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1135	//scr_touch (false);
1136		1097
1137	#ifdef HAVE_BG_PIXMAP	1098	#ifdef HAVE_BG_PIXMAP
1138	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1099	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1139	// if (bgPixmap.pixmap)	1100	// if (bgPixmap.pixmap)
1140	// scr_touch (false);	1101	// scr_touch (false);
…		…
1212		1173
1213	/* Checking whether input method is running. */	1174	/* Checking whether input method is running. */
1214	bool	1175	bool
1215	rxvt_term::IMisRunning ()	1176	rxvt_term::IMisRunning ()
1216	{	1177	{
1217	char *p;
1218	Atom atom;	1178	Atom atom;
1219	Window win;	1179	Window win;
1220	char server[IMBUFSIZ];	1180	char server[IMBUFSIZ];
1221		1181
1222	/* get current locale modifier */	1182	/* get current locale modifier */
1223	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1183	if (char *p = XSetLocaleModifiers (0))
1224	{	1184	{
1225	strcpy (server, "@server=");	1185	strcpy (server, "@server=");
1226	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1186	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1227		1187
1228	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1188	if (p = strchr (server + 1, '@')) /* first one only */
1229	*p = '\0';	1189	*p = '\0';
1230		1190
1231	atom = XInternAtom (dpy, server, False);	1191	atom = XInternAtom (dpy, server, False);
1232	win = XGetSelectionOwner (dpy, atom);	1192	win = XGetSelectionOwner (dpy, atom);
1233		1193
…		…
1300		1260
1301	term->make_current ();	1261	term->make_current ();
1302		1262
1303	if (text)	1263	if (text)
1304	{	1264	{
1305	void *str;	1265	wchar_t *str;
1306		1266
1307	if (!text->encoding_is_wchar && text->string.multi_byte)	1267	if (!text->encoding_is_wchar && text->string.multi_byte)
1308	{	1268	{
1309	// of course, X makes it ugly again	1269	// of course, X makes it ugly again
1310	if (term->rs[Rs_imLocale])	1270	if (term->rs[Rs_imLocale])
1311	SET_LOCALE (term->rs[Rs_imLocale]);	1271	SET_LOCALE (term->rs[Rs_imLocale]);
1312		1272
1313	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1273	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1314	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1274	mbstowcs (str, text->string.multi_byte, text->length + 1);
1315		1275
1316	if (term->rs[Rs_imLocale])	1276	if (term->rs[Rs_imLocale])
1317	SET_LOCALE (term->locale);	1277	SET_LOCALE (term->locale);
1318	}	1278	}
1319	else	1279	else
1320	str = (void *)text->string.wide_char;	1280	str = text->string.wide_char;
1321		1281
1322	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1282	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1323	DT_INT, call_data->caret,	1283	DT_INT, call_data->caret,
1324	DT_INT, call_data->chg_first,	1284	DT_INT, call_data->chg_first,
1325	DT_INT, call_data->chg_length,	1285	DT_INT, call_data->chg_length,
…		…
1679	void	1639	void
1680	rxvt_term::get_window_origin (int &x, int &y)	1640	rxvt_term::get_window_origin (int &x, int &y)
1681	{	1641	{
1682	Window cr;	1642	Window cr;
1683	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1643	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1684	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1685	}	1644	}
1686		1645
1687	Pixmap	1646	Pixmap
1688	rxvt_term::get_pixmap_property (int prop_id)	1647	rxvt_term::get_pixmap_property (Atom property)
1689	{	1648	{
1690	if (prop_id > 0 && prop_id < NUM_XA)	1649	Pixmap pixmap = None;
1691	if (xa[prop_id])	1650
1692	{
1693	int aformat;	1651	int aformat;
1694	unsigned long nitems, bytes_after;	1652	unsigned long nitems, bytes_after;
1695	Atom atype;	1653	Atom atype;
1696	unsigned char *prop = NULL;	1654	unsigned char *prop;
1697	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1655	int result = XGetWindowProperty (dpy, display->root, property,
1698	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1656	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1699	&nitems, &bytes_after, &prop);	1657	&nitems, &bytes_after, &prop);
1700	if (result == Success && prop && atype == XA_PIXMAP)	1658	if (result == Success)
		1659	{
		1660	if (atype == XA_PIXMAP)
1701	return (Pixmap )prop;	1661	pixmap = (Pixmap )prop;
		1662	XFree (prop);
1702	}	1663	}
1703		1664
1704	return None;	1665	return pixmap;
1705	}	1666	}
1706		1667
1707	#ifdef HAVE_BG_PIXMAP	1668	#ifdef HAVE_BG_PIXMAP
1708	# if TRACE_PIXMAPS
1709	# undef update_background
1710	void
1711	rxvt_term::trace_update_background (const char *file, int line)
1712	{
1713	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1714	update_background ();
1715	}
1716	# endif
1717		1669
1718	void	1670	void
1719	rxvt_term::update_background ()	1671	rxvt_term::update_background ()
1720	{	1672	{
		1673	if (update_background_ev.is_active ())
		1674	return;
		1675
1721	bgPixmap.invalidate ();	1676	bgPixmap.invalidate ();
1722		1677
1723	/* no chance of real time refresh if we are blurring! */	1678	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1724	if (bgPixmap.invalid_since + 0.50 < ev::now ()	1679
1725	&& !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1680	if (to_wait <= 0.)
1726	{
1727	update_background_ev.stop ();
1728	bgPixmap.render ();	1681	bgPixmap.render ();
1729	}
1730	else	1682	else
1731	{
1732	ev_tstamp refresh;
1733
1734	if (!bgPixmap.need_client_side_rendering ())
1735	refresh = .05;
1736	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1737	refresh = .20; /* very slow !!! */
1738	else
1739	refresh = .07;
1740
1741	update_background_ev.start (refresh);	1683	update_background_ev.start (to_wait);
1742	}
1743	}	1684	}
1744		1685
1745	void	1686	void
1746	rxvt_term::update_background_cb (ev::timer &w, int revents)	1687	rxvt_term::update_background_cb (ev::timer &w, int revents)
1747	{	1688	{
1748	make_current ();	1689	make_current ();
		1690
		1691	update_background_ev.stop ();
1749	bgPixmap.render ();	1692	bgPixmap.render ();
1750	refresh_check ();	1693	refresh_check ();
1751	}	1694	}
1752		1695
1753	#endif /* HAVE_BG_PIXMAP */	1696	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC vs. Revision 1.343 by sf-exg, Tue Dec 21 10:37:42 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC vs.
Revision 1.343 by sf-exg, Tue Dec 21 10:37:42 2010 UTC