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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs.
Revision 1.321 by sf-exg, Sun Feb 14 11:11:10 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.
…		…
170	#endif	170	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	173	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	176	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	178	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	180	#endif
183	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
226	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
227	delete fontset[i];	225	delete fontset[i];
228	#endif	226	#endif
229	delete fontset[0];	227	delete fontset[0];
230		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
231	if (display)	239	if (display)
232	{	240	{
233	selection_clear ();	241	selection_clear ();
		242	selection_clear (true);
234		243
235	#ifdef USE_XIM	244	#ifdef USE_XIM
236	im_destroy ();	245	im_destroy ();
237	#endif	246	#endif
238	#ifdef XTERM_SCROLLBAR	247	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);	248	if (gc) XFreeGC (dpy, gc);
263		249
264	delete drawable;	250	delete drawable;
265	// destroy all windows	251	// destroy all windows
266	if (parent[0])	252	if (parent[0])
…		…
274	pix_colors_unfocused [i].free (this);	260	pix_colors_unfocused [i].free (this);
275	#endif	261	#endif
276	}	262	}
277		263
278	clear ();	264	clear ();
279	}
280		265
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 */	266	display->flush (); /* ideally .put should do this */
290	displays.put (display);	267	displays.put (display);
		268	}
291		269
292	scr_release ();	270	scr_release ();
293		271
294	/* clear all resources */	272	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	273	for (int i = 0; i < allocated.size (); i++)
296	free (allocated [i]);	274	free (allocated [i]);
297		275
298	free (selection.text);	276	free (selection.text);
		277	free (selection.clip_text);
299	// TODO: manage env vars in child only(!)	278	// TODO: manage env vars in child only(!)
300	free (env_display);	279	free (env_display);
301	free (env_term);	280	free (env_term);
302	free (locale);	281	free (locale);
303	free (v_buffer);	282	free (v_buffer);
…		…
341	if (display)	320	if (display)
342	{	321	{
343	#if USE_XIM	322	#if USE_XIM
344	im_ev.stop (display);	323	im_ev.stop (display);
345	#endif	324	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	325	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	326	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	327	rootwin_ev.stop (display);
351	#endif	328	#endif
352	incr_ev.stop ();	329	incr_ev.stop ();
353	termwin_ev.stop (display);	330	termwin_ev.stop (display);
…		…
472	DisplayString (display));	449	DisplayString (display));
473	rxvt_emergency_cleanup ();	450	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	451	_exit (EXIT_FAILURE);
475	}	452	}
476		453
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	#ifdef HAVE_AFTERIMAGE
527	if (rs [Rs_blurradius])
528	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529	#endif
530	if (ISSET_PIXCOLOR (Color_tint))
531	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532	if (rs [Rs_shade])
533	bgPixmap.set_shade (rs [Rs_shade]);
534
535	bgPixmap.set_root_pixmap ();
536	XSelectInput (dpy, display->root, PropertyChangeMask);
537	rootwin_ev.start (display, display->root);
538	}
539	#endif
540
541	#ifdef BG_IMAGE_FROM_FILE
542	if (rs[Rs_backgroundPixmap] != NULL)
543	{
544	const char *p = rs[Rs_backgroundPixmap];
545
546	if ((p = strchr (p, ';')) != NULL)
547	{
548	p++;
549	bgPixmap.set_geometry (p);
550	}
551	else
552	bgPixmap.set_defaultGeometry ();
553
554	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555	if (!bgPixmap.window_position_sensitive ())
556	update_background ();
557	}
558	#endif
559	}
560	#endif
561
562	#if ENABLE_PERL
563	rootwin_ev.start (display, display->root);
564	#endif
565
566	set_colorfgbg ();
567
568	init_command (cmd_argv);
569
570	free (cmd_argv);
571
572	if (pty->pty >= 0)
573	pty_ev.start (pty->pty, ev::READ);
574
575	HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577	#if ENABLE_XEMBED
578	if (rs[Rs_embed])
579	{
580	long info[2] = { 0, XEMBED_MAPPED };
581
582	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583	32, PropModeReplace, (unsigned char *)&info, 2);
584	}
585	#endif
586
587	XMapWindow (dpy, vt);
588	XMapWindow (dpy, parent[0]);
589	}
590
591	static struct sig_handlers	454	static struct sig_handlers
592	{	455	{
593	ev::sig sw_term, sw_int;	456	ev::sig sw_term, sw_int;
594		457
595	/*	458	/*
…		…
647	*/	510	*/
648	void	511	void
649	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	512	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650	{	513	{
651	short recalc_x, recalc_y;	514	short recalc_x, recalc_y;
652	int x, y, sb_w, flags;	515	int x, y, flags;
653	unsigned int w, h;	516	unsigned int w, h;
654	unsigned int max_width, max_height;	517	unsigned int max_width, max_height;
655		518
656	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	519	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
657	szHint.win_gravity = NorthWestGravity;	520	szHint.win_gravity = NorthWestGravity;
…		…
667	if (rs[Rs_geometry])	530	if (rs[Rs_geometry])
668	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	531	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
669		532
670	if (flags & WidthValue)	533	if (flags & WidthValue)
671	{	534	{
		535	if (!w)
		536	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		537
672	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	538	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
673	szHint.flags \|= USSize;	539	szHint.flags \|= USSize;
674	}	540	}
675		541
676	if (flags & HeightValue)	542	if (flags & HeightValue)
677	{	543	{
		544	if (!h)
		545	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		546
678	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	547	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
679	szHint.flags \|= USSize;	548	szHint.flags \|= USSize;
680	}	549	}
681		550
682	if (flags & XValue)	551	if (flags & XValue)
683	{	552	{
…		…
714	max_width = MAX_COLS * fwidth;	583	max_width = MAX_COLS * fwidth;
715	max_height = MAX_ROWS * fheight;	584	max_height = MAX_ROWS * fheight;
716		585
717	szHint.base_width = szHint.base_height = 2 * int_bwidth;	586	szHint.base_width = szHint.base_height = 2 * int_bwidth;
718		587
719	sb_w = 0;
720	window_vt_x = window_vt_y = int_bwidth;	588	window_vt_x = window_vt_y = int_bwidth;
721		589
722	if (scrollBar.state)	590	if (scrollBar.state)
723	{	591	{
724	sb_w = scrollbar_TotalWidth ();	592	int sb_w = scrollBar.total_width ();
725	szHint.base_width += sb_w;	593	szHint.base_width += sb_w;
726		594
727	if (!option (Opt_scrollBar_right))	595	if (!option (Opt_scrollBar_right))
728	window_vt_x += sb_w;	596	window_vt_x += sb_w;
729	}	597	}
…		…
753	{	621	{
754	min_it (height, max_height);	622	min_it (height, max_height);
755	szHint.height = szHint.base_height + height;	623	szHint.height = szHint.base_height + height;
756	}	624	}
757		625
758	if (scrollBar.state && option (Opt_scrollBar_right))
759	window_sb_x = szHint.width - sb_w;
760
761	if (recalc_x)	626	if (recalc_x)
762	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	627	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763		628
764	if (recalc_y)	629	if (recalc_y)
765	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	630	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
766		631
767	ncol = width / fwidth;	632	ncol = width / fwidth;
768	nrow = height / fheight;	633	nrow = height / fheight;
769	}	634	}
770		635
771	/----------------------------------------------------------------------/	636	/----------------------------------------------------------------------/
772	/*	637	/*
…		…
783		648
784	ws.ws_col = ncol;	649	ws.ws_col = ncol;
785	ws.ws_row = nrow;	650	ws.ws_row = nrow;
786	ws.ws_xpixel = width;	651	ws.ws_xpixel = width;
787	ws.ws_ypixel = height;	652	ws.ws_ypixel = height;
788	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	653	ioctl (pty->pty, TIOCSWINSZ, &ws);
789		654
790	#if 0	655	#if 0
791	// TIOCSWINSZ is supposed to do this automatically and correctly	656	// TIOCSWINSZ is supposed to do this automatically and correctly
792	if (cmd_pid) /* force through to the command */	657	if (cmd_pid) /* force through to the command */
793	kill (-cmd_pid, SIGWINCH);	658	kill (-cmd_pid, SIGWINCH);
…		…
825	delete fontset[0];	690	delete fontset[0];
826	fontset[0] = fs;	691	fontset[0] = fs;
827		692
828	prop = (*fs)[1]->properties ();	693	prop = (*fs)[1]->properties ();
829	prop.height += lineSpace;	694	prop.height += lineSpace;
		695	prop.width += letterSpace;
830		696
831	fs->set_prop (prop, false);	697	fs->set_prop (prop, false);
832		698
833	fwidth = prop.width;	699	fwidth = prop.width;
834	fheight = prop.height;	700	fheight = prop.height;
…		…
923	void	789	void
924	rxvt_term::set_window_color (int idx, const char *color)	790	rxvt_term::set_window_color (int idx, const char *color)
925	{	791	{
926	#ifdef XTERM_COLOR_CHANGE	792	#ifdef XTERM_COLOR_CHANGE
927	rxvt_color xcol;	793	rxvt_color xcol;
928	int i;
929		794
930	if (color == NULL \|\| *color == '\0')	795	if (color == NULL \|\| *color == '\0')
931	return;	796	return;
932		797
933	color = strdup (color);	798	color = strdup (color);
…		…
935	rs[Rs_color + idx] = color;	800	rs[Rs_color + idx] = color;
936		801
937	/* handle color aliases */	802	/* handle color aliases */
938	if (isdigit (*color))	803	if (isdigit (*color))
939	{	804	{
940	i = atoi (color);	805	int i = atoi (color);
941		806
942	if (i >= 8 && i <= 15)	807	if (i >= 8 && i <= 15)
943	{	808	{
944	/* bright colors */	809	/* bright colors */
945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	810	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1049	int old_width = szHint.width;	914	int old_width = szHint.width;
1050	int old_height = szHint.height;	915	int old_height = szHint.height;
1051		916
1052	window_calc (newwidth, newheight);	917	window_calc (newwidth, newheight);
1053		918
1054	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);
1055	XSetWMNormalHints (dpy, parent[0], &szHint);	925	XSetWMNormalHints (dpy, parent[0], &szHint);
		926	szHint.flags \|= PBaseSize \| PResizeInc;
		927	}
1056		928
1057	if (!ignoreparent)	929	if (!ignoreparent)
1058	{	930	{
1059	#ifdef SMART_RESIZE	931	#ifdef SMART_RESIZE
1060	/*	932	/*
…		…
1100	#else	972	#else
1101	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	973	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1102	#endif	974	#endif
1103	}	975	}
1104		976
		977	if (set_hint)
		978	XSetWMNormalHints (dpy, parent[0], &szHint);
		979
1105	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	980	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1106		981
1107	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	982	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1108	{	983	{
1109	if (scrollBar.state)	984	if (scrollBar.state)
1110	{	985	scrollBar.resize ();
1111	XMoveResizeWindow (dpy, scrollBar.win,
1112	window_sb_x, 0,
1113	scrollbar_TotalWidth (), szHint.height);
1114	resize_scrollbar ();
1115	}
1116		986
1117	XMoveResizeWindow (dpy, vt,	987	XMoveResizeWindow (dpy, vt,
1118	window_vt_x, window_vt_y,	988	window_vt_x, window_vt_y,
1119	width, height);	989	width, height);
1120		990
1121	#ifdef HAVE_BG_PIXMAP	991	#ifdef HAVE_BG_PIXMAP
1122	if (bgPixmap.window_size_sensitive ())	992	if (bgPixmap.window_size_sensitive ())
1123	update_background ();	993	update_background ();
1124	#endif	994	#endif
1125
1126	scr_clear ();
1127	}	995	}
1128		996
1129	if (fix_screen \|\| old_height == 0)	997	if (fix_screen \|\| old_height == 0)
1130	scr_reset ();	998	scr_reset ();
1131
1132	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1133	//scr_touch (false);
1134		999
1135	#ifdef HAVE_BG_PIXMAP	1000	#ifdef HAVE_BG_PIXMAP
1136	// 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 ?
1137	// if (bgPixmap.pixmap)	1002	// if (bgPixmap.pixmap)
1138	// scr_touch (false);	1003	// scr_touch (false);
…		…
1210		1075
1211	/* Checking whether input method is running. */	1076	/* Checking whether input method is running. */
1212	bool	1077	bool
1213	rxvt_term::IMisRunning ()	1078	rxvt_term::IMisRunning ()
1214	{	1079	{
1215	char *p;
1216	Atom atom;	1080	Atom atom;
1217	Window win;	1081	Window win;
1218	char server[IMBUFSIZ];	1082	char server[IMBUFSIZ];
1219		1083
1220	/* get current locale modifier */	1084	/* get current locale modifier */
1221	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1085	if (char *p = XSetLocaleModifiers (0))
1222	{	1086	{
1223	strcpy (server, "@server=");	1087	strcpy (server, "@server=");
1224	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1088	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1225		1089
1226	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1090	if (p = strchr (server + 1, '@')) /* first one only */
1227	*p = '\0';	1091	*p = '\0';
1228		1092
1229	atom = XInternAtom (dpy, server, False);	1093	atom = XInternAtom (dpy, server, False);
1230	win = XGetSelectionOwner (dpy, atom);	1094	win = XGetSelectionOwner (dpy, atom);
1231		1095
…		…
1298		1162
1299	term->make_current ();	1163	term->make_current ();
1300		1164
1301	if (text)	1165	if (text)
1302	{	1166	{
1303	void *str;	1167	wchar_t *str;
1304		1168
1305	if (!text->encoding_is_wchar && text->string.multi_byte)	1169	if (!text->encoding_is_wchar && text->string.multi_byte)
1306	{	1170	{
1307	// of course, X makes it ugly again	1171	// of course, X makes it ugly again
1308	if (term->rs[Rs_imLocale])	1172	if (term->rs[Rs_imLocale])
1309	SET_LOCALE (term->rs[Rs_imLocale]);	1173	SET_LOCALE (term->rs[Rs_imLocale]);
1310		1174
1311	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1175	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1312	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1176	mbstowcs (str, text->string.multi_byte, text->length + 1);
1313		1177
1314	if (term->rs[Rs_imLocale])	1178	if (term->rs[Rs_imLocale])
1315	SET_LOCALE (term->locale);	1179	SET_LOCALE (term->locale);
1316	}	1180	}
1317	else	1181	else
1318	str = (void *)text->string.wide_char;	1182	str = text->string.wide_char;
1319		1183
1320	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1184	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1321	DT_INT, call_data->caret,	1185	DT_INT, call_data->caret,
1322	DT_INT, call_data->chg_first,	1186	DT_INT, call_data->chg_first,
1323	DT_INT, call_data->chg_length,	1187	DT_INT, call_data->chg_length,
…		…
1694	unsigned char *prop = NULL;	1558	unsigned char *prop = NULL;
1695	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1559	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1560	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697	&nitems, &bytes_after, &prop);	1561	&nitems, &bytes_after, &prop);
1698	if (result == Success && prop && atype == XA_PIXMAP)	1562	if (result == Success && prop && atype == XA_PIXMAP)
1699	{
1700	return (Pixmap )prop;	1563	return (Pixmap )prop;
1701	}
1702	}	1564	}
		1565
1703	return None;	1566	return None;
1704	}	1567	}
1705		1568
1706	#ifdef HAVE_BG_PIXMAP	1569	#ifdef HAVE_BG_PIXMAP
1707	# if TRACE_PIXMAPS	1570	# if TRACE_PIXMAPS
1708	# undef update_background	1571	# undef update_background
		1572	void
1709	int rxvt_term::trace_update_background (const char *file, int line)	1573	rxvt_term::trace_update_background (const char *file, int line)
1710	{	1574	{
1711	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1575	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712	update_background ();	1576	update_background ();
1713	}	1577	}
1714	# endif	1578	# endif
1715		1579
1716	int	1580	void
1717	rxvt_term::update_background ()	1581	rxvt_term::update_background ()
1718	{	1582	{
		1583	if (update_background_ev.is_active ())
		1584	return;
		1585
1719	bgPixmap.invalidate ();	1586	bgPixmap.invalidate ();
1720		1587
1721	/* no chance of real time refresh if we are blurring! */	1588	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1589
		1590	if (to_wait <= 0.)
1723	bgPixmap.render ();	1591	bgPixmap.render ();
1724	else	1592	else
1725	{
1726	ev_tstamp refresh;
1727	update_background_ev.stop ();
1728
1729	if (!bgPixmap.need_client_side_rendering ())
1730	refresh = .05;
1731	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732	refresh = .20; /* very slow !!! */
1733	else
1734	refresh = .07;
1735	update_background_ev.start (refresh);	1593	update_background_ev.start (to_wait);
1736	}
1737
1738	return 0;
1739	}	1594	}
1740		1595
1741	void	1596	void
1742	rxvt_term::update_background_cb (ev::timer &w, int revents)	1597	rxvt_term::update_background_cb (ev::timer &w, int revents)
1743	{	1598	{
1744	make_current ();	1599	make_current ();
		1600
		1601	update_background_ev.stop ();
1745	bgPixmap.render ();	1602	bgPixmap.render ();
1746	refresh_check ();	1603	refresh_check ();
1747	}	1604	}
1748		1605
1749	#endif /* HAVE_BG_PIXMAP */	1606	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs. Revision 1.321 by sf-exg, Sun Feb 14 11:11:10 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs.
Revision 1.321 by sf-exg, Sun Feb 14 11:11:10 2010 UTC