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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC vs.
Revision 1.322 by root, Tue Mar 30 23:00:35 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;	266	display->flush (); /* ideally .put should do this */
282	#if OFF_FOCUS_FADING
283	delete [] pix_colors_unfocused;
284	#endif
285
286	#ifdef HAVE_BG_PIXMAP
287	bgPixmap.destroy ();
288	#endif
289	displays.put (display);	267	displays.put (display);
		268	}
290		269
291	scr_release ();	270	scr_release ();
292		271
293	/* clear all resources */	272	/* clear all resources */
294	for (int i = 0; i < allocated.size (); i++)	273	for (int i = 0; i < allocated.size (); i++)
295	free (allocated [i]);	274	free (allocated [i]);
296		275
297	free (selection.text);	276	free (selection.text);
		277	free (selection.clip_text);
298	// TODO: manage env vars in child only(!)	278	// TODO: manage env vars in child only(!)
299	free (env_display);	279	free (env_display);
300	free (env_term);	280	free (env_term);
301	free (locale);	281	free (locale);
302	free (v_buffer);	282	free (v_buffer);
…		…
340	if (display)	320	if (display)
341	{	321	{
342	#if USE_XIM	322	#if USE_XIM
343	im_ev.stop (display);	323	im_ev.stop (display);
344	#endif	324	#endif
345	#if HAVE_SCROLLBARS
346	scrollbar_ev.stop (display);	325	scrollbar_ev.stop (display);
347	#endif
348	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	326	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
349	rootwin_ev.stop (display);	327	rootwin_ev.stop (display);
350	#endif	328	#endif
351	incr_ev.stop ();	329	incr_ev.stop ();
352	termwin_ev.stop (display);	330	termwin_ev.stop (display);
…		…
471	DisplayString (display));	449	DisplayString (display));
472	rxvt_emergency_cleanup ();	450	rxvt_emergency_cleanup ();
473	_exit (EXIT_FAILURE);	451	_exit (EXIT_FAILURE);
474	}	452	}
475		453
476	/----------------------------------------------------------------------/
477	void
478	rxvt_term::init (int argc, const char const argv, stringvec *envv)
479	{
480	this->envv = envv;
481
482	SET_R (this);
483	set_locale ("");
484	set_environ (envv); // few things in X do not call setlocale :(
485
486	init_vars ();
487
488	init_secondary ();
489
490	const char **cmd_argv = init_resources (argc, argv);
491
492	#ifdef KEYSYM_RESOURCE
493	keyboard->register_done ();
494	#endif
495
496	#ifdef HAVE_SCROLLBARS
497	if (option (Opt_scrollBar))
498	scrollBar.setIdle (); /* set existence for size calculations */
499	#endif
500
501	pty = ptytty::create ();
502
503	create_windows (argc, argv);
504
505	init_xlocale ();
506
507	scr_reset (); // initialize screen
508
509	#if 0
510	XSynchronize (dpy, True);
511	#endif
512
513	#ifdef HAVE_SCROLLBARS
514	if (option (Opt_scrollBar))
515	resize_scrollbar (); /* create and map scrollbar */
516	#endif
517	#ifdef HAVE_BG_PIXMAP
518	{
519	bgPixmap.set_target (this);
520
521	#ifdef ENABLE_TRANSPARENCY
522	if (option (Opt_transparent))
523	{
524	bgPixmap.set_transparent ();
525	#ifdef HAVE_AFTERIMAGE
526	if (rs [Rs_blurradius])
527	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528	#endif
529	if (ISSET_PIXCOLOR (Color_tint))
530	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
531	if (rs [Rs_shade])
532	bgPixmap.set_shade (rs [Rs_shade]);
533
534	bgPixmap.set_root_pixmap ();
535	XSelectInput (dpy, display->root, PropertyChangeMask);
536	rootwin_ev.start (display, display->root);
537	}
538	#endif
539
540	#ifdef BG_IMAGE_FROM_FILE
541	if (rs[Rs_backgroundPixmap] != NULL)
542	{
543	const char *p = rs[Rs_backgroundPixmap];
544
545	if ((p = strchr (p, ';')) != NULL)
546	{
547	p++;
548	bgPixmap.set_geometry (p);
549	}
550	else
551	bgPixmap.set_defaultGeometry ();
552
553	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554	if (!bgPixmap.window_position_sensitive ())
555	update_background ();
556	}
557	#endif
558	}
559	#endif
560
561	#if ENABLE_PERL
562	rootwin_ev.start (display, display->root);
563	#endif
564
565	set_colorfgbg ();
566
567	init_command (cmd_argv);
568
569	free (cmd_argv);
570
571	if (pty->pty >= 0)
572	pty_ev.start (pty->pty, ev::READ);
573
574	HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576	#if ENABLE_XEMBED
577	if (rs[Rs_embed])
578	{
579	long info[2] = { 0, XEMBED_MAPPED };
580
581	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582	32, PropModeReplace, (unsigned char *)&info, 2);
583	}
584	#endif
585
586	XMapWindow (dpy, vt);
587	XMapWindow (dpy, parent[0]);
588	}
589
590	static struct sig_handlers	454	static struct sig_handlers
591	{	455	{
592	ev::sig sw_term, sw_int;	456	ev::sig sw_term, sw_int;
593		457
594	/*	458	/*
…		…
637	XSetIOErrorHandler (rxvt_xioerror_handler);	501	XSetIOErrorHandler (rxvt_xioerror_handler);
638		502
639	XrmInitialize ();	503	XrmInitialize ();
640	}	504	}
641		505
642	/* ------------------------------------------------------------------------- *
643	* MEMORY ALLOCATION WRAPPERS *
644	* ------------------------------------------------------------------------- */
645	void *
646	rxvt_malloc (size_t size)
647	{
648	void *p = malloc (size);
649
650	if (!p)
651	rxvt_fatal ("memory allocation failure. aborting.\n");
652
653	return p;
654	}
655
656	void *
657	rxvt_calloc (size_t number, size_t size)
658	{
659	void *p = calloc (number, size);
660
661	if (!p)
662	rxvt_fatal ("memory allocation failure. aborting.\n");
663
664	return p;
665	}
666
667	void *
668	rxvt_realloc (void *ptr, size_t size)
669	{
670	void *p = realloc (ptr, size);
671
672	if (!p)
673	rxvt_fatal ("memory allocation failure. aborting.\n");
674
675	return p;
676	}
677
678	/----------------------------------------------------------------------/	506	/----------------------------------------------------------------------/
679	/*	507	/*
680	* window size/position calculations for XSizeHint and other storage.	508	* window size/position calculations for XSizeHint and other storage.
681	* if width/height are non-zero then override calculated width/height	509	* if width/height are non-zero then override calculated width/height
682	*/	510	*/
683	void	511	void
684	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	512	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
685	{	513	{
686	short recalc_x, recalc_y;	514	short recalc_x, recalc_y;
687	int x, y, sb_w, flags;	515	int x, y, flags;
688	unsigned int w, h;	516	unsigned int w, h;
689	unsigned int max_width, max_height;	517	unsigned int max_width, max_height;
690		518
691	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	519	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
692	szHint.win_gravity = NorthWestGravity;	520	szHint.win_gravity = NorthWestGravity;
…		…
702	if (rs[Rs_geometry])	530	if (rs[Rs_geometry])
703	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	531	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
704		532
705	if (flags & WidthValue)	533	if (flags & WidthValue)
706	{	534	{
		535	if (!w)
		536	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		537
707	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	538	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
708	szHint.flags \|= USSize;	539	szHint.flags \|= USSize;
709	}	540	}
710		541
711	if (flags & HeightValue)	542	if (flags & HeightValue)
712	{	543	{
		544	if (!h)
		545	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		546
713	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	547	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
714	szHint.flags \|= USSize;	548	szHint.flags \|= USSize;
715	}	549	}
716		550
717	if (flags & XValue)	551	if (flags & XValue)
718	{	552	{
…		…
749	max_width = MAX_COLS * fwidth;	583	max_width = MAX_COLS * fwidth;
750	max_height = MAX_ROWS * fheight;	584	max_height = MAX_ROWS * fheight;
751		585
752	szHint.base_width = szHint.base_height = 2 * int_bwidth;	586	szHint.base_width = szHint.base_height = 2 * int_bwidth;
753		587
754	sb_w = 0;
755	window_vt_x = window_vt_y = int_bwidth;	588	window_vt_x = window_vt_y = int_bwidth;
756		589
757	if (scrollBar.state)	590	if (scrollBar.state)
758	{	591	{
759	sb_w = scrollbar_TotalWidth ();	592	int sb_w = scrollBar.total_width ();
760	szHint.base_width += sb_w;	593	szHint.base_width += sb_w;
761		594
762	if (!option (Opt_scrollBar_right))	595	if (!option (Opt_scrollBar_right))
763	window_vt_x += sb_w;	596	window_vt_x += sb_w;
764	}	597	}
…		…
788	{	621	{
789	min_it (height, max_height);	622	min_it (height, max_height);
790	szHint.height = szHint.base_height + height;	623	szHint.height = szHint.base_height + height;
791	}	624	}
792		625
793	if (scrollBar.state && option (Opt_scrollBar_right))
794	window_sb_x = szHint.width - sb_w;
795
796	if (recalc_x)	626	if (recalc_x)
797	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	627	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798		628
799	if (recalc_y)	629	if (recalc_y)
800	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	630	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
801		631
802	ncol = width / fwidth;	632	ncol = width / fwidth;
803	nrow = height / fheight;	633	nrow = height / fheight;
804	}	634	}
805		635
806	/----------------------------------------------------------------------/	636	/----------------------------------------------------------------------/
807	/*	637	/*
…		…
818		648
819	ws.ws_col = ncol;	649	ws.ws_col = ncol;
820	ws.ws_row = nrow;	650	ws.ws_row = nrow;
821	ws.ws_xpixel = width;	651	ws.ws_xpixel = width;
822	ws.ws_ypixel = height;	652	ws.ws_ypixel = height;
823	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	653	ioctl (pty->pty, TIOCSWINSZ, &ws);
824		654
825	#if 0	655	#if 0
826	// TIOCSWINSZ is supposed to do this automatically and correctly	656	// TIOCSWINSZ is supposed to do this automatically and correctly
827	if (cmd_pid) /* force through to the command */	657	if (cmd_pid) /* force through to the command */
828	kill (-cmd_pid, SIGWINCH);	658	kill (-cmd_pid, SIGWINCH);
…		…
858	#endif	688	#endif
859		689
860	delete fontset[0];	690	delete fontset[0];
861	fontset[0] = fs;	691	fontset[0] = fs;
862		692
863	prop = (*fs)[1]->properties ();	693	prop = fs->get (0, 1)->properties ();
864	prop.height += lineSpace;	694	prop.height += lineSpace;
		695	prop.width += letterSpace;
865		696
866	fs->set_prop (prop, false);	697	fs->set_prop (prop, false);
867		698
868	fwidth = prop.width;	699	fwidth = prop.width;
869	fheight = prop.height;	700	fheight = prop.height;
…		…
958	void	789	void
959	rxvt_term::set_window_color (int idx, const char *color)	790	rxvt_term::set_window_color (int idx, const char *color)
960	{	791	{
961	#ifdef XTERM_COLOR_CHANGE	792	#ifdef XTERM_COLOR_CHANGE
962	rxvt_color xcol;	793	rxvt_color xcol;
963	int i;
964		794
965	if (color == NULL \|\| *color == '\0')	795	if (color == NULL \|\| *color == '\0')
966	return;	796	return;
967		797
968	color = strdup (color);	798	color = strdup (color);
…		…
970	rs[Rs_color + idx] = color;	800	rs[Rs_color + idx] = color;
971		801
972	/* handle color aliases */	802	/* handle color aliases */
973	if (isdigit (*color))	803	if (isdigit (*color))
974	{	804	{
975	i = atoi (color);	805	int i = atoi (color);
976		806
977	if (i >= 8 && i <= 15)	807	if (i >= 8 && i <= 15)
978	{	808	{
979	/* bright colors */	809	/* bright colors */
980	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	810	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1084	int old_width = szHint.width;	914	int old_width = szHint.width;
1085	int old_height = szHint.height;	915	int old_height = szHint.height;
1086		916
1087	window_calc (newwidth, newheight);	917	window_calc (newwidth, newheight);
1088		918
1089	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);
1090	XSetWMNormalHints (dpy, parent[0], &szHint);	925	XSetWMNormalHints (dpy, parent[0], &szHint);
		926	szHint.flags \|= PBaseSize \| PResizeInc;
		927	}
1091		928
1092	if (!ignoreparent)	929	if (!ignoreparent)
1093	{	930	{
1094	#ifdef SMART_RESIZE	931	#ifdef SMART_RESIZE
1095	/*	932	/*
…		…
1135	#else	972	#else
1136	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	973	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1137	#endif	974	#endif
1138	}	975	}
1139		976
		977	if (set_hint)
		978	XSetWMNormalHints (dpy, parent[0], &szHint);
		979
1140	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	980	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1141		981
1142	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	982	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1143	{	983	{
1144	if (scrollBar.state)	984	if (scrollBar.state)
1145	{	985	scrollBar.resize ();
1146	XMoveResizeWindow (dpy, scrollBar.win,
1147	window_sb_x, 0,
1148	scrollbar_TotalWidth (), szHint.height);
1149	resize_scrollbar ();
1150	}
1151		986
1152	XMoveResizeWindow (dpy, vt,	987	XMoveResizeWindow (dpy, vt,
1153	window_vt_x, window_vt_y,	988	window_vt_x, window_vt_y,
1154	width, height);	989	width, height);
1155		990
1156	#ifdef HAVE_BG_PIXMAP	991	#ifdef HAVE_BG_PIXMAP
1157	if (bgPixmap.window_size_sensitive ())	992	if (bgPixmap.window_size_sensitive ())
1158	update_background ();	993	update_background ();
1159	#endif	994	#endif
1160
1161	scr_clear ();
1162	}	995	}
1163		996
1164	if (fix_screen \|\| old_height == 0)	997	if (fix_screen \|\| old_height == 0)
1165	scr_reset ();	998	scr_reset ();
1166
1167	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1168	//scr_touch (false);
1169		999
1170	#ifdef HAVE_BG_PIXMAP	1000	#ifdef HAVE_BG_PIXMAP
1171	// 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 ?
1172	// if (bgPixmap.pixmap)	1002	// if (bgPixmap.pixmap)
1173	// scr_touch (false);	1003	// scr_touch (false);
…		…
1245		1075
1246	/* Checking whether input method is running. */	1076	/* Checking whether input method is running. */
1247	bool	1077	bool
1248	rxvt_term::IMisRunning ()	1078	rxvt_term::IMisRunning ()
1249	{	1079	{
1250	char *p;
1251	Atom atom;	1080	Atom atom;
1252	Window win;	1081	Window win;
1253	char server[IMBUFSIZ];	1082	char server[IMBUFSIZ];
1254		1083
1255	/* get current locale modifier */	1084	/* get current locale modifier */
1256	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1085	if (char *p = XSetLocaleModifiers (0))
1257	{	1086	{
1258	strcpy (server, "@server=");	1087	strcpy (server, "@server=");
1259	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1088	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1260		1089
1261	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1090	if (p = strchr (server + 1, '@')) /* first one only */
1262	*p = '\0';	1091	*p = '\0';
1263		1092
1264	atom = XInternAtom (dpy, server, False);	1093	atom = XInternAtom (dpy, server, False);
1265	win = XGetSelectionOwner (dpy, atom);	1094	win = XGetSelectionOwner (dpy, atom);
1266		1095
…		…
1333		1162
1334	term->make_current ();	1163	term->make_current ();
1335		1164
1336	if (text)	1165	if (text)
1337	{	1166	{
1338	void *str;	1167	wchar_t *str;
1339		1168
1340	if (!text->encoding_is_wchar && text->string.multi_byte)	1169	if (!text->encoding_is_wchar && text->string.multi_byte)
1341	{	1170	{
1342	// of course, X makes it ugly again	1171	// of course, X makes it ugly again
1343	if (term->rs[Rs_imLocale])	1172	if (term->rs[Rs_imLocale])
1344	SET_LOCALE (term->rs[Rs_imLocale]);	1173	SET_LOCALE (term->rs[Rs_imLocale]);
1345		1174
1346	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1175	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1347	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1176	mbstowcs (str, text->string.multi_byte, text->length + 1);
1348		1177
1349	if (term->rs[Rs_imLocale])	1178	if (term->rs[Rs_imLocale])
1350	SET_LOCALE (term->locale);	1179	SET_LOCALE (term->locale);
1351	}	1180	}
1352	else	1181	else
1353	str = (void *)text->string.wide_char;	1182	str = text->string.wide_char;
1354		1183
1355	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1184	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1356	DT_INT, call_data->caret,	1185	DT_INT, call_data->caret,
1357	DT_INT, call_data->chg_first,	1186	DT_INT, call_data->chg_first,
1358	DT_INT, call_data->chg_length,	1187	DT_INT, call_data->chg_length,
…		…
1712	void	1541	void
1713	rxvt_term::get_window_origin (int &x, int &y)	1542	rxvt_term::get_window_origin (int &x, int &y)
1714	{	1543	{
1715	Window cr;	1544	Window cr;
1716	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1545	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1546	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1718	}	1547	}
1719		1548
1720	Pixmap	1549	Pixmap
1721	rxvt_term::get_pixmap_property (int prop_id)	1550	rxvt_term::get_pixmap_property (int prop_id)
1722	{	1551	{
…		…
1729	unsigned char *prop = NULL;	1558	unsigned char *prop = NULL;
1730	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1559	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1731	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1560	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732	&nitems, &bytes_after, &prop);	1561	&nitems, &bytes_after, &prop);
1733	if (result == Success && prop && atype == XA_PIXMAP)	1562	if (result == Success && prop && atype == XA_PIXMAP)
1734	{
1735	return (Pixmap )prop;	1563	return (Pixmap )prop;
1736	}
1737	}	1564	}
		1565
1738	return None;	1566	return None;
1739	}	1567	}
1740		1568
1741	#ifdef HAVE_BG_PIXMAP	1569	#ifdef HAVE_BG_PIXMAP
1742	# if TRACE_PIXMAPS	1570	# if TRACE_PIXMAPS
1743	# undef update_background	1571	# undef update_background
		1572	void
1744	int rxvt_term::trace_update_background (const char *file, int line)	1573	rxvt_term::trace_update_background (const char *file, int line)
1745	{	1574	{
1746	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1575	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747	update_background ();	1576	update_background ();
1748	}	1577	}
1749	# endif	1578	# endif
1750		1579
1751	int	1580	void
1752	rxvt_term::update_background ()	1581	rxvt_term::update_background ()
1753	{	1582	{
		1583	if (update_background_ev.is_active ())
		1584	return;
		1585
1754	bgPixmap.invalidate ();	1586	bgPixmap.invalidate ();
1755		1587
1756	/* no chance of real time refresh if we are blurring! */	1588	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1757	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1589
		1590	if (to_wait <= 0.)
1758	bgPixmap.render ();	1591	bgPixmap.render ();
1759	else	1592	else
1760	{
1761	update_background_ev.stop ();
1762
1763	if (!bgPixmap.need_client_side_rendering())
1764	update_background_ev.start (.05);	1593	update_background_ev.start (to_wait);
1765	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766	update_background_ev.start (.20); /* very slow !!! */
1767	else
1768	update_background_ev.start (.07);
1769	}
1770
1771	return 0;
1772	}	1594	}
1773		1595
1774	void	1596	void
1775	rxvt_term::update_background_cb (ev::timer &w, int revents)	1597	rxvt_term::update_background_cb (ev::timer &w, int revents)
1776	{	1598	{
1777	make_current ();	1599	make_current ();
		1600
		1601	update_background_ev.stop ();
1778	bgPixmap.render ();	1602	bgPixmap.render ();
1779	refresh_check ();	1603	refresh_check ();
1780	}	1604	}
1781		1605
1782	#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.284 by root, Fri Dec 14 06:29:28 2007 UTC vs. Revision 1.322 by root, Tue Mar 30 23:00:35 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC vs.
Revision 1.322 by root, Tue Mar 30 23:00:35 2010 UTC