[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.331 by sf-exg, Mon Jul 26 22:07:38 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-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.
…		…
35	#include "keyboard.h"	35	#include "keyboard.h"
36	#include "rxvtperl.h"	36	#include "rxvtperl.h"
37		37
38	#include <limits>	38	#include <limits>
39		39
		40	#include <cassert>
40	#include <csignal>	41	#include <csignal>
41	#include <cstring>	42	#include <cstring>
42		43
43	#include <termios.h>	44	#include <termios.h>
44		45
…		…
101	{	102	{
102	if (cc->c2 == c2) return c1;	103	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	104	cc = (*this)[cc->c1];
104	}	105	}
105		106
106	// check to see wether this combination already exists otherwise	107	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	108	for (cc = v.end (); cc-- > v.begin (); )
108	{	109	{
109	if (cc->c1 == c1 && cc->c2 == c2)	110	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	111	return COMPOSE_LO + (cc - v.begin ());
111	}	112	}
…		…
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	174	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	177	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	179	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	181	#endif
183	#ifdef POINTER_BLANK	182	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
226	if (fontset[i] != fontset[0])	225	if (fontset[i] != fontset[0])
227	delete fontset[i];	226	delete fontset[i];
228	#endif	227	#endif
229	delete fontset[0];	228	delete fontset[0];
230		229
		230	#ifdef HAVE_BG_PIXMAP
		231	bgPixmap.destroy ();
		232	#endif
		233	#ifdef HAVE_AFTERIMAGE
		234	if (asv)
		235	destroy_asvisual (asv, 0);
		236	if (asimman)
		237	destroy_image_manager (asimman, 0);
		238	#endif
		239
231	if (display)	240	if (display)
232	{	241	{
233	selection_clear ();	242	selection_clear ();
		243	selection_clear (true);
234		244
235	#ifdef USE_XIM	245	#ifdef USE_XIM
236	im_destroy ();	246	im_destroy ();
237	#endif	247	#endif
238	#ifdef XTERM_SCROLLBAR	248	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);	249	if (gc) XFreeGC (dpy, gc);
263		250
264	delete drawable;	251	delete drawable;
265	// destroy all windows	252	// destroy all windows
266	if (parent[0])	253	if (parent[0])
…		…
274	pix_colors_unfocused [i].free (this);	261	pix_colors_unfocused [i].free (this);
275	#endif	262	#endif
276	}	263	}
277		264
278	clear ();	265	clear ();
279	}
280		266
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 */	267	display->flush (); /* ideally .put should do this */
290	displays.put (display);	268	displays.put (display);
		269	}
291		270
292	scr_release ();	271	scr_release ();
293		272
294	/* clear all resources */	273	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
296	free (allocated [i]);	275	free (allocated [i]);
297		276
298	free (selection.text);	277	free (selection.text);
		278	free (selection.clip_text);
299	// TODO: manage env vars in child only(!)	279	// TODO: manage env vars in child only(!)
300	free (env_display);	280	free (env_display);
301	free (env_term);	281	free (env_term);
302	free (locale);	282	free (locale);
303	free (v_buffer);	283	free (v_buffer);
…		…
341	if (display)	321	if (display)
342	{	322	{
343	#if USE_XIM	323	#if USE_XIM
344	im_ev.stop (display);	324	im_ev.stop (display);
345	#endif	325	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	326	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	328	rootwin_ev.stop (display);
351	#endif	329	#endif
352	incr_ev.stop ();	330	incr_ev.stop ();
353	termwin_ev.stop (display);	331	termwin_ev.stop (display);
…		…
405	char mesg[BUFSIZ];	383	char mesg[BUFSIZ];
406	char number[32];	384	char number[32];
407	char *mtype = "XlibMessage";	385	char *mtype = "XlibMessage";
408	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410	rxvt_warn ("An X Error occured, trying to continue after report.\n");	388	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411	rxvt_warn ("%s: %s\n", mesg, buffer);	389	rxvt_warn ("%s: %s\n", mesg, buffer);
412	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	391	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414	sprintf(number, "%d", event->request_code);	392	sprintf(number, "%d", event->request_code);
415	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	393	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416	rxvt_warn ("(which is %s)\n", buffer);	394	rxvt_warn ("(which is %s)\n", buffer);
417	if (event->request_code >= 128) {	395	if (event->request_code >= 128) {
418	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	396	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419	mesg, BUFSIZ);	397	mesg, BUFSIZ);
420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	398	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421	}	399	}
422	if ((event->error_code == BadWindow) \|\|	400	if ((event->error_code == BadWindow) \|\|
423	(event->error_code == BadPixmap) \|\|	401	(event->error_code == BadPixmap) \|\|
424	(event->error_code == BadCursor) \|\|	402	(event->error_code == BadCursor) \|\|
425	(event->error_code == BadFont) \|\|	403	(event->error_code == BadFont) \|\|
426	(event->error_code == BadDrawable) \|\|	404	(event->error_code == BadDrawable) \|\|
427	(event->error_code == BadColor) \|\|	405	(event->error_code == BadColor) \|\|
428	(event->error_code == BadGC) \|\|	406	(event->error_code == BadGC) \|\|
429	(event->error_code == BadIDChoice) \|\|	407	(event->error_code == BadIDChoice) \|\|
430	(event->error_code == BadValue) \|\|	408	(event->error_code == BadValue) \|\|
431	(event->error_code == BadAtom)) {	409	(event->error_code == BadAtom)) {
432	if (event->error_code == BadValue)	410	if (event->error_code == BadValue)
433	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	411	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434	mesg, BUFSIZ);	412	mesg, BUFSIZ);
435	else if (event->error_code == BadAtom)	413	else if (event->error_code == BadAtom)
436	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	414	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437	mesg, BUFSIZ);	415	mesg, BUFSIZ);
438	else	416	else
439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440	mesg, BUFSIZ);	418	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	419	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442	}	420	}
443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	421	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444	mesg, BUFSIZ);	422	mesg, BUFSIZ);
445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446	}	424	}
447	#endif	425	#endif
448		426
449	int	427	int
…		…
472	DisplayString (display));	450	DisplayString (display));
473	rxvt_emergency_cleanup ();	451	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	452	_exit (EXIT_FAILURE);
475	}	453	}
476		454
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	455	static struct sig_handlers
594	{	456	{
595	ev::sig sw_term, sw_int;	457	ev::sig sw_term, sw_int;
596		458
597	/*	459	/*
…		…
617	char **rxvt_environ; // startup environment	479	char **rxvt_environ; // startup environment
618		480
619	void	481	void
620	rxvt_init ()	482	rxvt_init ()
621	{	483	{
		484	assert (("fontMask must not overlap other RS masks",
		485	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
		486
		487	// get rid of stdin/stdout as we don't need them, to free resources
		488	dup2 (STDERR_FILENO, STDIN_FILENO);
		489	dup2 (STDERR_FILENO, STDOUT_FILENO);
		490
622	ptytty::init ();	491	ptytty::init ();
623		492
624	if (!ev_default_loop (0))	493	if (!ev_default_loop (0))
625	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	494	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626		495
…		…
629	signal (SIGHUP, SIG_IGN);	498	signal (SIGHUP, SIG_IGN);
630	signal (SIGPIPE, SIG_IGN);	499	signal (SIGPIPE, SIG_IGN);
631		500
632	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	501	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633	sig_handlers.sw_int.start (SIGINT); ev_unref ();	502	sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
636	/* signal (SIGURG, SIG_DFL); */
637		503
638	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	504	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639	// TODO: handle this with exceptions and tolerate the memory loss	505	// TODO: handle this with exceptions and tolerate the memory loss
640	XSetIOErrorHandler (rxvt_xioerror_handler);	506	XSetIOErrorHandler (rxvt_xioerror_handler);
641		507
…		…
649	*/	515	*/
650	void	516	void
651	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	517	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
652	{	518	{
653	short recalc_x, recalc_y;	519	short recalc_x, recalc_y;
654	int x, y, sb_w, flags;	520	int x, y, flags;
655	unsigned int w, h;	521	unsigned int w, h;
656	unsigned int max_width, max_height;	522	unsigned int max_width, max_height;
657		523
658	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	524	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
659	szHint.win_gravity = NorthWestGravity;	525	szHint.win_gravity = NorthWestGravity;
…		…
669	if (rs[Rs_geometry])	535	if (rs[Rs_geometry])
670	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	536	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
671		537
672	if (flags & WidthValue)	538	if (flags & WidthValue)
673	{	539	{
		540	if (!w)
		541	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		542
674	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	543	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
675	szHint.flags \|= USSize;	544	szHint.flags \|= USSize;
676	}	545	}
677		546
678	if (flags & HeightValue)	547	if (flags & HeightValue)
679	{	548	{
		549	if (!h)
		550	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		551
680	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	552	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
681	szHint.flags \|= USSize;	553	szHint.flags \|= USSize;
682	}	554	}
683		555
684	if (flags & XValue)	556	if (flags & XValue)
685	{	557	{
…		…
716	max_width = MAX_COLS * fwidth;	588	max_width = MAX_COLS * fwidth;
717	max_height = MAX_ROWS * fheight;	589	max_height = MAX_ROWS * fheight;
718		590
719	szHint.base_width = szHint.base_height = 2 * int_bwidth;	591	szHint.base_width = szHint.base_height = 2 * int_bwidth;
720		592
721	sb_w = 0;
722	window_vt_x = window_vt_y = int_bwidth;	593	window_vt_x = window_vt_y = int_bwidth;
723		594
724	if (scrollBar.state)	595	if (scrollBar.state)
725	{	596	{
726	sb_w = scrollbar_TotalWidth ();	597	int sb_w = scrollBar.total_width ();
727	szHint.base_width += sb_w;	598	szHint.base_width += sb_w;
728		599
729	if (!option (Opt_scrollBar_right))	600	if (!option (Opt_scrollBar_right))
730	window_vt_x += sb_w;	601	window_vt_x += sb_w;
731	}	602	}
…		…
755	{	626	{
756	min_it (height, max_height);	627	min_it (height, max_height);
757	szHint.height = szHint.base_height + height;	628	szHint.height = szHint.base_height + height;
758	}	629	}
759		630
760	if (scrollBar.state && option (Opt_scrollBar_right))
761	window_sb_x = szHint.width - sb_w;
762
763	if (recalc_x)	631	if (recalc_x)
764	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	632	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
765		633
766	if (recalc_y)	634	if (recalc_y)
767	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	635	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
768		636
769	ncol = width / fwidth;	637	ncol = width / fwidth;
770	nrow = height / fheight;	638	nrow = height / fheight;
771	}	639	}
772		640
773	/----------------------------------------------------------------------/	641	/----------------------------------------------------------------------/
774	/*	642	/*
…		…
785		653
786	ws.ws_col = ncol;	654	ws.ws_col = ncol;
787	ws.ws_row = nrow;	655	ws.ws_row = nrow;
788	ws.ws_xpixel = width;	656	ws.ws_xpixel = width;
789	ws.ws_ypixel = height;	657	ws.ws_ypixel = height;
790	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	658	ioctl (pty->pty, TIOCSWINSZ, &ws);
791		659
792	#if 0	660	#if 0
793	// TIOCSWINSZ is supposed to do this automatically and correctly	661	// TIOCSWINSZ is supposed to do this automatically and correctly
794	if (cmd_pid) /* force through to the command */	662	if (cmd_pid) /* force through to the command */
795	kill (-cmd_pid, SIGWINCH);	663	kill (-cmd_pid, SIGWINCH);
…		…
825	#endif	693	#endif
826		694
827	delete fontset[0];	695	delete fontset[0];
828	fontset[0] = fs;	696	fontset[0] = fs;
829		697
830	prop = (*fs)[1]->properties ();	698	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
831	prop.height += lineSpace;	699	prop.height += lineSpace;
		700	prop.width += letterSpace;
832		701
833	fs->set_prop (prop, false);	702	fs->set_prop (prop, false);
834		703
835	fwidth = prop.width;	704	fwidth = prop.width;
836	fheight = prop.height;	705	fheight = prop.height;
…		…
886	prop, XA_STRING, 8, PropModeReplace,	755	prop, XA_STRING, 8, PropModeReplace,
887	(const unsigned char *)str, len >= 0 ? len : strlen (str));	756	(const unsigned char *)str, len >= 0 ? len : strlen (str));
888	}	757	}
889		758
890	void	759	void
		760	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		761	{
		762	XTextProperty ct;
		763
		764	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		765	{
		766	XSetTextProperty (dpy, parent[0], &ct, prop);
		767	XFree (ct.value);
		768	}
		769	}
		770
		771	void
891	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	772	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
892	{	773	{
893	wchar_t *ws = rxvt_mbstowcs (str, len);	774	wchar_t *ws = rxvt_mbstowcs (str, len);
894	char *s = rxvt_wcstoutf8 (ws);	775	char *s = rxvt_wcstoutf8 (ws);
895		776
…		…
905	/----------------------------------------------------------------------/	786	/----------------------------------------------------------------------/
906	/* xterm sequences - title, iconName, color (exptl) */	787	/* xterm sequences - title, iconName, color (exptl) */
907	void	788	void
908	rxvt_term::set_title (const char *str)	789	rxvt_term::set_title (const char *str)
909	{	790	{
910	set_string_property (XA_WM_NAME, str);	791	set_mbstring_property (XA_WM_NAME, str);
911	#if ENABLE_EWMH	792	#if ENABLE_EWMH
912	set_utf8_property (xa[XA_NET_WM_NAME], str);	793	set_utf8_property (xa[XA_NET_WM_NAME], str);
913	#endif	794	#endif
914	}	795	}
915		796
916	void	797	void
917	rxvt_term::set_icon_name (const char *str)	798	rxvt_term::set_icon_name (const char *str)
918	{	799	{
919	set_string_property (XA_WM_ICON_NAME, str);	800	set_mbstring_property (XA_WM_ICON_NAME, str);
920	#if ENABLE_EWMH	801	#if ENABLE_EWMH
921	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	802	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
922	#endif	803	#endif
923	}	804	}
924		805
925	void	806	void
926	rxvt_term::set_window_color (int idx, const char *color)	807	rxvt_term::set_window_color (int idx, const char *color)
927	{	808	{
928	#ifdef XTERM_COLOR_CHANGE	809	#ifdef XTERM_COLOR_CHANGE
929	rxvt_color xcol;	810	rxvt_color xcol;
930	int i;
931		811
932	if (color == NULL \|\| *color == '\0')	812	if (color == NULL \|\| *color == '\0')
933	return;	813	return;
934		814
935	color = strdup (color);	815	color = strdup (color);
…		…
937	rs[Rs_color + idx] = color;	817	rs[Rs_color + idx] = color;
938		818
939	/* handle color aliases */	819	/* handle color aliases */
940	if (isdigit (*color))	820	if (isdigit (*color))
941	{	821	{
942	i = atoi (color);	822	int i = atoi (color);
943		823
944	if (i >= 8 && i <= 15)	824	if (i >= 8 && i <= 15)
945	{	825	{
946	/* bright colors */	826	/* bright colors */
947	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	827	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1051	int old_width = szHint.width;	931	int old_width = szHint.width;
1052	int old_height = szHint.height;	932	int old_height = szHint.height;
1053		933
1054	window_calc (newwidth, newheight);	934	window_calc (newwidth, newheight);
1055		935
1056	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	936	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		937
		938	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		939	if (set_hint)
		940	{
		941	szHint.flags &= ~(PBaseSize \| PResizeInc);
1057	XSetWMNormalHints (dpy, parent[0], &szHint);	942	XSetWMNormalHints (dpy, parent[0], &szHint);
		943	szHint.flags \|= PBaseSize \| PResizeInc;
		944	}
1058		945
1059	if (!ignoreparent)	946	if (!ignoreparent)
1060	{	947	{
1061	#ifdef SMART_RESIZE	948	#ifdef SMART_RESIZE
1062	/*	949	/*
…		…
1102	#else	989	#else
1103	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	990	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1104	#endif	991	#endif
1105	}	992	}
1106		993
		994	if (set_hint)
		995	XSetWMNormalHints (dpy, parent[0], &szHint);
		996
1107	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	997	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1108		998
1109	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	999	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1110	{	1000	{
1111	if (scrollBar.state)	1001	if (scrollBar.state)
1112	{	1002	scrollBar.resize ();
1113	XMoveResizeWindow (dpy, scrollBar.win,
1114	window_sb_x, 0,
1115	scrollbar_TotalWidth (), szHint.height);
1116	resize_scrollbar ();
1117	}
1118		1003
1119	XMoveResizeWindow (dpy, vt,	1004	XMoveResizeWindow (dpy, vt,
1120	window_vt_x, window_vt_y,	1005	window_vt_x, window_vt_y,
1121	width, height);	1006	width, height);
1122		1007
1123	#ifdef HAVE_BG_PIXMAP	1008	#ifdef HAVE_BG_PIXMAP
1124	if (bgPixmap.window_size_sensitive ())	1009	if (bgPixmap.window_size_sensitive ())
1125	update_background ();	1010	update_background ();
1126	#endif	1011	#endif
1127
1128	scr_clear ();
1129	}	1012	}
1130		1013
1131	if (fix_screen \|\| old_height == 0)	1014	if (fix_screen \|\| old_height == 0)
1132	scr_reset ();	1015	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		1016
1137	#ifdef HAVE_BG_PIXMAP	1017	#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 ?	1018	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1139	// if (bgPixmap.pixmap)	1019	// if (bgPixmap.pixmap)
1140	// scr_touch (false);	1020	// scr_touch (false);
…		…
1212		1092
1213	/* Checking whether input method is running. */	1093	/* Checking whether input method is running. */
1214	bool	1094	bool
1215	rxvt_term::IMisRunning ()	1095	rxvt_term::IMisRunning ()
1216	{	1096	{
1217	char *p;
1218	Atom atom;	1097	Atom atom;
1219	Window win;	1098	Window win;
1220	char server[IMBUFSIZ];	1099	char server[IMBUFSIZ];
1221		1100
1222	/* get current locale modifier */	1101	/* get current locale modifier */
1223	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1102	if (char *p = XSetLocaleModifiers (0))
1224	{	1103	{
1225	strcpy (server, "@server=");	1104	strcpy (server, "@server=");
1226	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1105	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1227		1106
1228	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1107	if (p = strchr (server + 1, '@')) /* first one only */
1229	*p = '\0';	1108	*p = '\0';
1230		1109
1231	atom = XInternAtom (dpy, server, False);	1110	atom = XInternAtom (dpy, server, False);
1232	win = XGetSelectionOwner (dpy, atom);	1111	win = XGetSelectionOwner (dpy, atom);
1233		1112
…		…
1300		1179
1301	term->make_current ();	1180	term->make_current ();
1302		1181
1303	if (text)	1182	if (text)
1304	{	1183	{
1305	void *str;	1184	wchar_t *str;
1306		1185
1307	if (!text->encoding_is_wchar && text->string.multi_byte)	1186	if (!text->encoding_is_wchar && text->string.multi_byte)
1308	{	1187	{
1309	// of course, X makes it ugly again	1188	// of course, X makes it ugly again
1310	if (term->rs[Rs_imLocale])	1189	if (term->rs[Rs_imLocale])
1311	SET_LOCALE (term->rs[Rs_imLocale]);	1190	SET_LOCALE (term->rs[Rs_imLocale]);
1312		1191
1313	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1192	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1314	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1193	mbstowcs (str, text->string.multi_byte, text->length + 1);
1315		1194
1316	if (term->rs[Rs_imLocale])	1195	if (term->rs[Rs_imLocale])
1317	SET_LOCALE (term->locale);	1196	SET_LOCALE (term->locale);
1318	}	1197	}
1319	else	1198	else
1320	str = (void *)text->string.wide_char;	1199	str = text->string.wide_char;
1321		1200
1322	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1201	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1323	DT_INT, call_data->caret,	1202	DT_INT, call_data->caret,
1324	DT_INT, call_data->chg_first,	1203	DT_INT, call_data->chg_first,
1325	DT_INT, call_data->chg_length,	1204	DT_INT, call_data->chg_length,
…		…
1716	# endif	1595	# endif
1717		1596
1718	void	1597	void
1719	rxvt_term::update_background ()	1598	rxvt_term::update_background ()
1720	{	1599	{
		1600	if (update_background_ev.is_active ())
		1601	return;
		1602
1721	bgPixmap.invalidate ();	1603	bgPixmap.invalidate ();
1722		1604
1723	/* no chance of real time refresh if we are blurring! */	1605	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1724	if (bgPixmap.invalid_since + 0.50 < ev::now ()	1606
1725	&& !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1607	if (to_wait <= 0.)
1726	{
1727	update_background_ev.stop ();
1728	bgPixmap.render ();	1608	bgPixmap.render ();
1729	}
1730	else	1609	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);	1610	update_background_ev.start (to_wait);
1742	}
1743	}	1611	}
1744		1612
1745	void	1613	void
1746	rxvt_term::update_background_cb (ev::timer &w, int revents)	1614	rxvt_term::update_background_cb (ev::timer &w, int revents)
1747	{	1615	{
1748	make_current ();	1616	make_current ();
		1617
		1618	update_background_ev.stop ();
1749	bgPixmap.render ();	1619	bgPixmap.render ();
1750	refresh_check ();	1620	refresh_check ();
1751	}	1621	}
1752		1622
1753	#endif /* HAVE_BG_PIXMAP */	1623	#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.331 by sf-exg, Mon Jul 26 22:07:38 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.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC